date:20170907

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2017-09-07 Thread translation

commit d26902e4f1cc30e689bb3c0deac4085d71be4dd9
Author: Translation commit bot 
Date:   Fri Sep 8 03:19:26 2017 +

Update translations for tor-browser-manual
---
 zh_CN/zh_CN.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index cef7cd5f4..535f8b7e0 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -1,5 +1,6 @@
 # Translators:
 # Mingye Wang , 2016
+# Meng San , 2017
 # YF , 2017
 # Chi-Hsun Tsai , 2017
 msgid ""
@@ -300,8 +301,8 @@ msgid ""
 " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-"
 "azure, meek-amazon."
 msgstr ""
-"å¦æè¿æ¯æ¨é¦æ¬¡å°è¯è§é¿ç½ç»è¿æ¥çå±è½æºå¶ï¼æ¨åºè¯¥è¦è¯çä½¿ç¨ä¸åçå¯ææä¼
 è¾å±ï¼obfs3ãobfs4ãScrambleSuitãFTEãmeek-"
-"azureãmeek-amazonã"
+"å è¿æ¥å°éé¦æ¬¡ä½¿ç¨è§é¿æ¹å¼æ¶ï¼è¯·å°è¯èªå¸¦çåç§ä¼ 
è¾æ¹å¼ï¼obfs3ãobfs4ãScrambleSuitãFTEãmeek-azure æ meek-"
+"amazonã"
 
 #: circumvention.page:72
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2017-09-07 Thread translation

commit 7d9ecf3a7057fd5067df7b003e93eed0ffbe8c44
Author: Translation commit bot 
Date:   Fri Sep 8 03:19:31 2017 +

Update translations for tor-browser-manual_completed
---
 zh_CN/zh_CN.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index cef7cd5f4..535f8b7e0 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -1,5 +1,6 @@
 # Translators:
 # Mingye Wang , 2016
+# Meng San , 2017
 # YF , 2017
 # Chi-Hsun Tsai , 2017
 msgid ""
@@ -300,8 +301,8 @@ msgid ""
 " should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-"
 "azure, meek-amazon."
 msgstr ""
-"å¦æè¿æ¯æ¨é¦æ¬¡å°è¯è§é¿ç½ç»è¿æ¥çå±è½æºå¶ï¼æ¨åºè¯¥è¦è¯çä½¿ç¨ä¸åçå¯ææä¼
 è¾å±ï¼obfs3ãobfs4ãScrambleSuitãFTEãmeek-"
-"azureãmeek-amazonã"
+"å è¿æ¥å°éé¦æ¬¡ä½¿ç¨è§é¿æ¹å¼æ¶ï¼è¯·å°è¯èªå¸¦çåç§ä¼ 
è¾æ¹å¼ï¼obfs3ãobfs4ãScrambleSuitãFTEãmeek-azure æ meek-"
+"amazonã"
 
 #: circumvention.page:72
 msgid ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] doc: Add our Ubuntu packager to ReleasingTor.md

2017-09-07 Thread nickm

commit 2080a986ed2abfed1528a659544615462bbea9ca
Author: David Goulet 
Date:   Thu Sep 7 12:35:31 2017 -0400

doc: Add our Ubuntu packager to ReleasingTor.md

His full name is: Simon Deziel.

Signed-off-by: David Goulet 
---
 doc/HACKING/ReleasingTor.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md
index 298712161..4eae44bcf 100644
--- a/doc/HACKING/ReleasingTor.md
+++ b/doc/HACKING/ReleasingTor.md
@@ -152,6 +152,7 @@ new Tor release:
- {Nathan} at freitas dot net
- {mike} at tig dot as
- {tails-rm} at boum dot org
+   - {simon} at sdeziel.info
 
 4. Add the version number to Trac.  To do this, go to Trac, log in,
 select "Admin" near the top of the screen, then select "Versions" from



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket23427_032_01'

2017-09-07 Thread nickm

commit e5e2df36f3cad69a63b46ed589f250afb31ab476
Merge: 36104e55e 2080a986e
Author: Nick Mathewson 
Date:   Thu Sep 7 15:20:01 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket23427_032_01'

 doc/HACKING/ReleasingTor.md | 1 +
 1 file changed, 1 insertion(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-09-07 Thread nickm

commit 5c2a3854d329cc411e05880169d6880c549a1e91
Merge: 9914f906e 08592c95f
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2017-09-07 Thread nickm

commit 6e37ba5543fc0351fe10709bd16cdfddae1de479
Merge: fa22cc651 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2017-09-07 Thread nickm

commit e17659b7011fa63b398b244f2cef225636ea08d5
Merge: 4e10ada1e 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-09-07 Thread nickm

commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-09-07 Thread nickm

commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

2017-09-07 Thread nickm

commit 36104e55e40338a535eadd6caebaea9ddf8795ac
Merge: f117da3ea 54fb1d0f7
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.1'

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-09-07 Thread nickm

commit 4c21daa9e2af5b88bc93baf5e14597f5924dcecd
Merge: 923efa3db a9d4df9a0
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-09-07 Thread nickm

commit 54fb1d0f7f25266eb85bc9031e5ea95deec5b9be
Merge: 9c404602a a9d4df9a0
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-09-07 Thread nickm

commit 636b5d19ae10f0e2a8a91a87751958178989bf7f
Merge: f0fa7a342 54fb1d0f7
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-09-07 Thread nickm

commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-09-07 Thread nickm

commit 54fb1d0f7f25266eb85bc9031e5ea95deec5b9be
Merge: 9c404602a a9d4df9a0
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-09-07 Thread nickm

commit 54fb1d0f7f25266eb85bc9031e5ea95deec5b9be
Merge: 9c404602a a9d4df9a0
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-09-07 Thread nickm

commit bcf2b413c32a86f68bac1894245fc753c0c388ef
Merge: 93b28972c 09618ffe3
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-09-07 Thread nickm

commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-09-07 Thread nickm

commit a9d4df9a0807704bf5cd1355c57ad0dc2a677a88
Merge: b548371f7 08592c95f
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:01 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-09-07 Thread nickm

commit 08592c95fa30703beee7b65cc5bdb8923cbe4bcb
Merge: 969602159 bcf2b413c
Author: Nick Mathewson 
Date:   Thu Sep 7 15:18:00 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/geoip-september2017 | 4 +
 src/config/geoip| 10802 --
 src/config/geoip6   |   941 +++-
 3 files changed, 6828 insertions(+), 4919 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] prop224: Specify new descriptor upload/fetching behavior.

2017-09-07 Thread nickm

commit 0b290856ba3d0823e0f5b56ed7628a2352d38324
Author: George Kadianakis 
Date:   Thu Sep 7 16:49:41 2017 +0300

prop224: Specify new descriptor upload/fetching behavior.

As part of our work in #23387, we figured out that there are some edge
cases where clients cannot connect to services if they are using
different live consensuses. That was because the overlap period was only
covering clients with a newer consensus than the service.

We are now extending the overlap period to be permanent, and alter its
logic so that it also covers clients with older consensus than the
service.

Now services always have two active descriptors at any given time.

This spec patch is a companion to the code branch of #23387.
---
 proposals/224-rend-spec-ng.txt | 183 ++---
 1 file changed, 136 insertions(+), 47 deletions(-)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index 9081976..8431d45 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -736,39 +736,30 @@ Table of contents:
 
 2.2.2.1. Overlapping descriptors
 
-   Hidden services need to upload their descriptors to the HSDirs _before_ the
-   beginning of each time period, so that they are readily available for
-   clients to fetch them. However, if every hidden service were to upload a new
-   descriptor at exactly the start of each time period, directories would get
-   overwhelmed by every host uploading at the same time.
-
-   To avoid this thundering herd problem, hidden services upload descriptors
-   for the upcoming time period at a random time _before_ the time period
-   starts.
-
-   For the above "descriptor overlap" system to work, fresh shared random
-   values must be available multiple hours *before* the time period changes, so
-   that hidden services have enough time to publish their overlap descriptors
-   to the future set of responsible HSDirs. In the current system, fresh shared
-   random values get published at 00:00UTC every day, whereas the time period
-   changes at 12:00UTC, giving 12 hours for hidden services to fetch new
-   consensuses and upload overlap descriptors.
-
-   Specifically, when a hidden service fetches a consensus with "valid-after"
-   between 00:00UTC and 12:00UTC, it goes into "descriptor overlap"
-   mode. During "descriptor overlap" mode, the hidden service uploads its
-   descriptor to the HSDirs of the current time period (using the previous SRV
-   from the consensus) _and_ it also uploads its descriptors for the upcoming
-   time period (using the current SRV from the consensus).
-
-   The above mechanism ensures that when the time period starts at 12:00UTC,
-   the hidden service will already have uploaded its descriptors to the
-   responsible HSDirs for that time period.
+   Hidden services need to upload multiple descriptors so that they can be
+   reachable to clients with older or newer consensuses than them. Services
+   need to upload their descriptors to the HSDirs _before_ the beginning of
+   each upcoming time period, so that they are readily available for clients to
+   fetch them. Furthermore, services should keep uploading their old descriptor
+   even after the end of a time period, so that they can be reachable by
+   clients that still have consensuses from the previous time period.
+
+   Hence, services maintain two active descriptors at every point. Clients on
+   the other hand, don't have a notion of overlapping descriptors, and instead
+   always download the descriptor for the current time period and shared random
+   value. It's the job of the service to ensure that descriptors will be
+   available for all clients. See section [FETCHUPLOADDESC] for how this is
+   achieved.
 
[TODO: What to do when we run multiple hidden services in a single host?]
 
 2.2.3. Where to publish a hidden service descriptor [WHERE-HSDESC]
 
+   This section specifies how the HSDir hash ring is formed at any given
+   time. Whenever a time value is needed (e.g. to get the current time period
+   number), we assume that clients and services use the valid-after time from
+   their latest live consensus.
+
The following consensus parameters control where a hidden service
descriptor is stored;
 
@@ -818,10 +809,17 @@ Table of contents:
Again, nodes from lower-numbered replicas are disregarded when
choosing the spread for a replica.
 
-2.2.4. Using time periods and SRVs to fetch/upload HS descriptors
+2.2.4. Using time periods and SRVs to fetch/upload HS descriptors 
[FETCHUPLOADDESC]
 
-   Hidden services and clients need to make correct use of time periods and
-   shared random values (SRVs) to successfuly fetch and upload descriptors.
+   Hidden services and clients need to make correct use of time periods (TP)
+   and shared random values (SRVs) to successfuly fetch and upload
+   descriptors. Furthermore, to avoid

[tor-commits] [webwml/master] Fixing osx docs style and side nav

2017-09-07 Thread hiro

commit 763316070c37a3b80158d87bd82924c1dda746ab
Author: hiromipaw 
Date:   Thu Sep 7 19:45:34 2017 +0200

Fixing osx docs style and side nav
---
 docs/en/sidenav.wmi | 2 +-
 docs/en/tor-doc-osx.wml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi
index 984fea00..2bfa 100644
--- a/docs/en/sidenav.wmi
+++ b/docs/en/sidenav.wmi
@@ -43,7 +43,7 @@
'txt'  => 'Installing Tor Source',
   },
   {'url'  => 'docs/tor-doc-osx',
-   'txt'  => 'MacPorts',
+   'txt'  => 'OSX',
   },
   {'url'  => 'docs/tor-relay-debian',
'txt'  => 'Configuring a Relay manually',
diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index 2d31d5dc..02175fcf 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -25,7 +25,7 @@
 this over TBB when they host hidden services or relay traffic for other Tor
 users.  
 
-Step One: Install A Package 
Manager
+Step One: Install a package 
manager
 
 
 There are two package manager on OS X: Homebrew and Macports. You can 
use the package manager of your choice.
@@ -102,7 +102,7 @@
 
 
 
-How To Uninstall Tor
+How to uninstall Tor
 
 
 Change your application proxy settings back to their original

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Adding homebrew instruction for tor on OSX

2017-09-07 Thread hiro

commit 8dc3ae194e9b4fbc1cabf93c2521ff0c65567005
Author: hiromipaw 
Date:   Thu Sep 7 19:28:57 2017 +0200

Adding homebrew instruction for tor on OSX
---
 docs/en/tor-doc-osx.wml | 24 +++-
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index 454efa9f..2d31d5dc 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -25,20 +25,34 @@
 this over TBB when they host hidden services or relay traffic for other Tor
 users.  
 
-Step One: Install 
Macports
+Step One: Install A Package 
Manager
 
 
+There are two package manager on OS X: Homebrew and Macports. You can 
use the package manager of your choice.
+
 
-Macports is a package manager for Mac OS X which provides a Tor package,
-along a lot of other stuff. Follow the instructions on https://www.macports.org/install.php;>its Website to install.
+To install Homebrew follow the instructions on https://brew.sh/;>brew.sh.
+
+
+
+To install Macports follow the instructions on https://www.macports.org/install.php;>macports.org/install.php.
 
 
 
 Step Two: Install Tor
 
 
-In a Terminal window, run:
+If you are using Homebrw in a Terminal window, run:
+
+brew install tor
+
+You will find a sample Tor configuration file at
+/usr/local/etc/tor/torrc.sample. Remove the .sample extension to
+make it effective.
+
+If you are using Macports in a Terminal window, run:
 
 sudo port install tor
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir

2017-09-07 Thread gk

commit b2dd98160a1c07f73f7ab66475cb02be295e4ee5
Author: Nicolas Vigier 
Date:   Thu Sep 7 13:01:02 2017 +0200

Bug 23403: Use tor-browser-build/tmp rather than /tmp as default tmp_dir
---
 README.BUILD_ERRORS| 16 
 rbm.conf   |  1 +
 rbm.local.conf.example |  6 --
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/README.BUILD_ERRORS b/README.BUILD_ERRORS
index 6be4319..0562f93 100644
--- a/README.BUILD_ERRORS
+++ b/README.BUILD_ERRORS
@@ -28,19 +28,3 @@ nopat
 $ qvm-pref --set [vmname] kernelopts 'nopat vsyscall=emulate'
 
 
-
-tmp partition is full
--
-
-If your /tmp partition is small, you will get a 'No space left on device'
-error during the build. To select an other directory with more space
-available to store temporary files, you can define the TMPDIR environment
-variable:
-
-
-$ mkdir /home/user/tmp
-$ export TMPDIR=/home/user/tmp
-
-
-You can also define the tmp_dir option in the rbm.local.conf file.
-
diff --git a/rbm.conf b/rbm.conf
index e131c36..a93df7f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -2,6 +2,7 @@
 debug: '[% GET ! ENV.RBM_NO_DEBUG %]'
 compress_tar: gz
 output_dir: "out/[% project %]"
+tmp_dir: '[% c("basedir") %]/tmp'
 build_log: '[% GET ENV.RBM_LOGS_DIR ? ENV.RBM_LOGS_DIR : "logs" %]/[% project 
%]-[% c("var/osname") %].log'
 
 pkg_type: build
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index 62d13b2..a6401a9 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -6,8 +6,10 @@
 ### options you want to modify.
 
 
-### The tmp_dir option defines where temporary files are stored.
-### You should modify this if your /tmp partition is small.
+### The tmp_dir option defines where temporary files are stored. The
+### builds are made from this directory, so using a directory on a fast
+### disk can improve build time. By default we are using a tmp directory
+### under the tor-browser-build directory.
 #tmp_dir: /tmp
 
 ### The debug option defines whether a debugging shell should be opened

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Remove not used script from torbutton docs page

2017-09-07 Thread hiro

commit 8cd9f6d219e24926d6aeab7b5a3e649e187e6ff3
Author: hiromipaw 
Date:   Thu Sep 7 17:38:19 2017 +0200

Remove not used script from torbutton docs page
---
 docs/torbutton/en/index.wml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml
index 18f5157e..057e1618 100644
--- a/docs/torbutton/en/index.wml
+++ b/docs/torbutton/en/index.wml
@@ -13,10 +13,7 @@
 
 
 
-
-
-
-
+d
 
 Torbutton
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Escaping equals sign in viewport

2017-09-07 Thread hiro

commit 56a20c470b33480e8f453defbada60c3cc3a81d9
Author: hiromipaw 
Date:   Thu Aug 24 16:16:17 2017 +0200

Escaping equals sign in viewport
---
 Makefile.common  |  1 -
 en/index.wml |  1 +
 include/head.wmi | 10 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index f42670e6..ce2c22c2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -26,7 +26,6 @@ WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) 
$(WMLBASE)/include/*.wmi )
 HTMLFILES=$(shell perl -le 's,  (.*)/(.*).wml  ,$$2.html.$$1,x, 
print $$_ for @ARGV' $(WMLFILES))
 DEPFILES=$(shell perl -le 's,  (.*)/(.*).wml  ,  .deps/$$2.html.$$1.d  ,x, 
print $$_ for @ARGV' $(WMLFILES))
 
-
 all: $(HTMLFILES)
 
 %.html.en: en/%.wml
diff --git a/en/index.wml b/en/index.wml
index c9cacf29..4a76adf3 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -4,6 +4,7 @@
 
 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"
 
+
 
 

diff --git a/include/head.wmi b/include/head.wmi
index 9d631a85..dc4d5e26 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -6,18 +6,22 @@
 #use "versions.wmi"
 #use "navigation.wmi"
 
+
+
+
+
+
 
  
  
 


-   
+   

mailto:get...@torproject.org] for 
help downloading Tor Browser.">

https://www.torproject.org/images/tor-logo.jpg;>
-   https://static-na.payments-amazon.com;>
 {#meta#}
 
$(TITLE)
@@ -40,7 +44,7 @@

- #  
+   #  
# end WML to generate css/js paths
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

2017-09-07 Thread hiro

commit 616edbb9b49fe160dd517fde066b472390548536
Merge: 1b806313 88b17d9e
Author: hiromipaw 
Date:   Thu Sep 7 15:56:40 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile   |  2 +-
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 3 files changed, 16 insertions(+), 12 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging

2017-09-07 Thread hiro

commit 7bf7ad9ebe1628193b1c5f9e3f2a455fd6fd282e
Merge: 646ccefe 52c29243
Author: hiromipaw 
Date:   Mon Aug 14 14:39:21 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 about/en/corepeople.wml|  2 +-
 about/en/sponsors.wml  | 16 +--
 include/versions.wmi   | 44 +++---
 projects/torbrowser/RecommendedTBBVersions | 18 ++--
 4 files changed, 39 insertions(+), 41 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Remove typo

2017-09-07 Thread hiro

commit f1ad83180a87da261d864153cd5410a0f114e5be
Author: hiromipaw 
Date:   Thu Sep 7 17:44:20 2017 +0200

Remove typo
---
 docs/torbutton/en/index.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml
index 057e1618..956aa206 100644
--- a/docs/torbutton/en/index.wml
+++ b/docs/torbutton/en/index.wml
@@ -13,7 +13,7 @@
 
 
 
-d
+
 
 Torbutton
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Fix security policy for amazon donate page

2017-09-07 Thread hiro

commit 646ccefe1c6435e24c0cbf64d56abdcbe8fd6ca0
Author: hiromipaw 
Date:   Tue Aug 8 11:43:45 2017 +0200

Fix security policy for amazon donate page
---
 include/head.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/head.wmi b/include/head.wmi
index 57081b2c..9d631a85 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -17,7 +17,7 @@
mailto:get...@torproject.org] for 
help downloading Tor Browser.">

https://www.torproject.org/images/tor-logo.jpg;>
-   
+   https://static-na.payments-amazon.com;>
 {#meta#}
 
$(TITLE)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Removing obsolete pages and includes

2017-09-07 Thread hiro

commit 9d8227b9da745930cbdd3c1789226256427a051e
Author: hiromipaw 
Date:   Thu Sep 7 17:45:43 2017 +0200

Removing obsolete pages and includes
---
 donate/en/thankyou.wml|  41 -
 include/thankyou-head.wmi | 146 --
 2 files changed, 187 deletions(-)

diff --git a/donate/en/thankyou.wml b/donate/en/thankyou.wml
deleted file mode 100644
index 6cc70661..
--- a/donate/en/thankyou.wml
+++ /dev/null
@@ -1,41 +0,0 @@
-## translation metadata
-# Revision: $Revision: 24807 $
-# Translation-Priority: 3-low
-
-#include "thankyou-head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
-
-  
-  
-
-Your donation helps support online privacy censorship 
circumvention around the globe!
-  
-  
-  
-  
-
-
-  
-  Sign up for our https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news;>newsletter
-  https://lists.torproject.org/cgi-bin/mailman/subscribe/tor-news;>
-   
-   Enter your email 
address:
-   
-   
-   
-  
-
-
-  
-
-
-  
-  Put them to good use
-  Volunteer for The Tor Project 

-
-
-  
-  
-  
-  
-
-#include 
diff --git a/include/thankyou-head.wmi b/include/thankyou-head.wmi
deleted file mode 100644
index 193c70bf..
--- a/include/thankyou-head.wmi
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /usr/bin/wml
-<: use strict; :>
-<: use warnings; :>
-#use "perl-globals.wmi"
-#use "links.wmi"
-#use "versions.wmi"
-#use "navigation.wmi"
-
-http://www.w3.org/TR/html4/strict.dtd;>
-
-
-  $(TITLE)
-  
-  ">
-  ">
-
-  # begin WML to generate css/js paths
-  ">
-  ">
-
-  
-  
-  
-  
-#  
-  # end WML to generate css/js paths
-
-  
-  
-  
-
-
-
-
-
-
-  
-Tor
-  # navigation menu generation
-  
-
-<:{
-# create a hash and maintain order of keys
-my %navigation;
-my @keys;
-while (@navigation) {
-  my $key = shift @navigation;
-  my $val = shift @navigation;
-  push @keys, $key;
-  $navigation{$key} = $val;
-}
-
-my $page = $WML_SRC_BASENAME;
-my $lang = "$(LANG)";
-
-for my $key (@keys) {
-  my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
-
-  # in directory of active link, set class active
-  my $class;
-  if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or 
($WML_SRC_BASENAME eq $base)) {
-$class = 'class="active"';
-  } else {
-$class = '';
-  }
-
-   $dir = '.' unless defined $dir;
-
-  # translated version
-  if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
-  printf '%s'."\n",
- 
stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
-  }
-  # english version
-  elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
-   printf '%s'."\n",
-  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), 
$navigation{$key};
-  }
-  # full url
-  elsif ($key =~/^http/) {
-printf '%s'."\n", $key, 
$navigation{$key};
-  } else {
-warn "$WML_SRC_FILENAME has a [page $key] (parses to
-docdir: $(DOCROOT)/; dir: $dir; base: $base -> 
$(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
-  }
-}
-}:>
-
-  
-  
- # end navigation generation
-  
-
-  <:{
-my %calltoaction;
-my @keys;
-while (@calltoaction) {
-  my $key = shift @calltoaction;
-  my $val = shift @calltoaction;
-  push @keys, $key;
-  $calltoaction{$key} = $val;
-}
-
-my $page = $WML_SRC_BASENAME;
-my $lang = "$(LANG)";
-for my $key (@keys) {
-  my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
-
-  # in directory, set active
-  my $class;
-  if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or 
($WML_SRC_BASENAME eq $base)) {
-  #if ($WML_SRC_BASENAME eq $base) {
-$class = 'class="active"';
-  } else {
-$class = '';
-  }
-
- $dir = '.' unless defined $dir;
-  # try to use a translated version
-  if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
-  printf '%s'."\n",
- 
stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
-  }
-  # default to english version
-  elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
-   printf '%s'."\n",
-  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), 
$calltoaction{$key};
-  }

[tor-commits] [webwml/master] Merge branch 'master' into staging

2017-09-07 Thread hiro

commit a478b99ef1fc09162efd8f12be6c6e71de34d255
Merge: 56a20c47 616edbb9
Author: hiromipaw 
Date:   Thu Sep 7 15:57:00 2017 +0200

Merge branch 'master' into staging

 Makefile   |   2 +-
 about/en/jobs-browserdeveloper.wml |   1 -
 about/en/jobs-developerandroid.wml |   3 +-
 about/en/jobs-osdeveloperandroid.wml   | 139 +
 about/en/jobs.wml  |   2 +-
 docs/torbutton/en/index.wml|   2 +
 include/versions.wmi   |  22 ++---
 press/en/press.wml |  24 +
 projects/torbrowser/RecommendedTBBVersions |   4 +
 9 files changed, 183 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Fix torbutton missing jquery error

2017-09-07 Thread hiro

commit 1b8063138301abf86c961c35417cd0bfb48b79e5
Author: hiromipaw 
Date:   Thu Sep 7 15:56:35 2017 +0200

Fix torbutton missing jquery error
---
 docs/torbutton/en/index.wml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml
index c8fe7a44..18f5157e 100644
--- a/docs/torbutton/en/index.wml
+++ b/docs/torbutton/en/index.wml
@@ -14,6 +14,8 @@
 
 
 
+
+
 
 
 Torbutton



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Removing obsolete pages and includes

2017-09-07 Thread hiro

commit 9d8227b9da745930cbdd3c1789226256427a051e
Author: hiromipaw 
Date:   Thu Sep 7 17:45:43 2017 +0200

Removing obsolete pages and includes
---
 donate/en/thankyou.wml|  41 -
 include/thankyou-head.wmi | 146 --
 2 files changed, 187 deletions(-)

diff --git a/donate/en/thankyou.wml b/donate/en/thankyou.wml
deleted file mode 100644
index 6cc70661..
--- a/donate/en/thankyou.wml
+++ /dev/null
@@ -1,41 +0,0 @@
-## translation metadata
-# Revision: $Revision: 24807 $
-# Translation-Priority: 3-low
-
-#include "thankyou-head.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
-
-  
-  
-
-Your donation helps support online privacy censorship 
circumvention around the globe!
-  
-  
-  
-  
-
-
-  
-  Sign up for our https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-news;>newsletter
-  https://lists.torproject.org/cgi-bin/mailman/subscribe/tor-news;>
-   
-   Enter your email 
address:
-   
-   
-   
-  
-
-
-  
-
-
-  
-  Put them to good use
-  Volunteer for The Tor Project 

-
-
-  
-  
-  
-  
-
-#include 
diff --git a/include/thankyou-head.wmi b/include/thankyou-head.wmi
deleted file mode 100644
index 193c70bf..
--- a/include/thankyou-head.wmi
+++ /dev/null
@@ -1,146 +0,0 @@
-#! /usr/bin/wml
-<: use strict; :>
-<: use warnings; :>
-#use "perl-globals.wmi"
-#use "links.wmi"
-#use "versions.wmi"
-#use "navigation.wmi"
-
-http://www.w3.org/TR/html4/strict.dtd;>
-
-
-  $(TITLE)
-  
-  ">
-  ">
-
-  # begin WML to generate css/js paths
-  ">
-  ">
-
-  
-  
-  
-  
-#  
-  # end WML to generate css/js paths
-
-  
-  
-  
-
-
-
-
-
-
-  
-Tor
-  # navigation menu generation
-  
-
-<:{
-# create a hash and maintain order of keys
-my %navigation;
-my @keys;
-while (@navigation) {
-  my $key = shift @navigation;
-  my $val = shift @navigation;
-  push @keys, $key;
-  $navigation{$key} = $val;
-}
-
-my $page = $WML_SRC_BASENAME;
-my $lang = "$(LANG)";
-
-for my $key (@keys) {
-  my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
-
-  # in directory of active link, set class active
-  my $class;
-  if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or 
($WML_SRC_BASENAME eq $base)) {
-$class = 'class="active"';
-  } else {
-$class = '';
-  }
-
-   $dir = '.' unless defined $dir;
-
-  # translated version
-  if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
-  printf '%s'."\n",
- 
stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key};
-  }
-  # english version
-  elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
-   printf '%s'."\n",
-  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), 
$navigation{$key};
-  }
-  # full url
-  elsif ($key =~/^http/) {
-printf '%s'."\n", $key, 
$navigation{$key};
-  } else {
-warn "$WML_SRC_FILENAME has a [page $key] (parses to
-docdir: $(DOCROOT)/; dir: $dir; base: $base -> 
$(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist.";
-  }
-}
-}:>
-
-  
-  
- # end navigation generation
-  
-
-  <:{
-my %calltoaction;
-my @keys;
-while (@calltoaction) {
-  my $key = shift @calltoaction;
-  my $val = shift @calltoaction;
-  push @keys, $key;
-  $calltoaction{$key} = $val;
-}
-
-my $page = $WML_SRC_BASENAME;
-my $lang = "$(LANG)";
-for my $key (@keys) {
-  my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,;
-
-  # in directory, set active
-  my $class;
-  if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or 
($WML_SRC_BASENAME eq $base)) {
-  #if ($WML_SRC_BASENAME eq $base) {
-$class = 'class="active"';
-  } else {
-$class = '';
-  }
-
- $dir = '.' unless defined $dir;
-  # try to use a translated version
-  if (-e "$(DOCROOT)/$dir/$lang/$base.wml") {
-  printf '%s'."\n",
- 
stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key};
-  }
-  # default to english version
-  elsif (-e "$(DOCROOT)/$dir/en/$base.wml") {
-   printf '%s'."\n",
-  stripDotSlashs("$(DOCROOT)/$dir/$base.html"), 
$calltoaction{$key};
-  }

[tor-commits] [webwml/staging] Remove typo

2017-09-07 Thread hiro

commit f1ad83180a87da261d864153cd5410a0f114e5be
Author: hiromipaw 
Date:   Thu Sep 7 17:44:20 2017 +0200

Remove typo
---
 docs/torbutton/en/index.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml
index 057e1618..956aa206 100644
--- a/docs/torbutton/en/index.wml
+++ b/docs/torbutton/en/index.wml
@@ -13,7 +13,7 @@
 
 
 
-d
+
 
 Torbutton
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Remove not used script from torbutton docs page

2017-09-07 Thread hiro

commit 8cd9f6d219e24926d6aeab7b5a3e649e187e6ff3
Author: hiromipaw 
Date:   Thu Sep 7 17:38:19 2017 +0200

Remove not used script from torbutton docs page
---
 docs/torbutton/en/index.wml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml
index 18f5157e..057e1618 100644
--- a/docs/torbutton/en/index.wml
+++ b/docs/torbutton/en/index.wml
@@ -13,10 +13,7 @@
 
 
 
-
-
-
-
+d
 
 Torbutton
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Whoops -- I messed a calltool target

2017-09-07 Thread nickm

commit f117da3ea006fbdda3f5e921d5f8da2ae3d3bdfd
Author: Nick Mathewson 
Date:   Thu Sep 7 11:03:22 2017 -0400

Whoops -- I messed a calltool target
---
 scripts/maint/run_calltool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/maint/run_calltool.sh b/scripts/maint/run_calltool.sh
index f7fa0c305..efb8706fe 100755
--- a/scripts/maint/run_calltool.sh
+++ b/scripts/maint/run_calltool.sh
@@ -11,7 +11,7 @@ fi
 
 mkdir -p callgraph
 
-SUBITEMS="fn_invgraph fn_scc fn_scc_weaklinks module_graph module_invgraph 
module_scc module_scc_weaklinks"
+SUBITEMS="fn_graph fn_invgraph fn_scc fn_scc_weaklinks module_graph 
module_invgraph module_scc module_scc_weaklinks"
 
 for calculation in $SUBITEMS; do
   echo " $calculation"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add support for running "calltool" on Tor via "make callgraph".

2017-09-07 Thread nickm

commit 283be00b0bf515ee80b4b1d809d99a2cd682c46b
Author: Nick Mathewson 
Date:   Thu Sep 7 10:51:02 2017 -0400

Add support for running "calltool" on Tor via "make callgraph".

Closes #19307.
---
 .gitignore|  1 +
 Makefile.am   |  4 
 changes/19037 |  7 +++
 scripts/maint/run_calltool.sh | 29 +
 4 files changed, 41 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0e0640de2..e9992fd1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ uptime-*.json
 /Tor*Bundle.dmg
 /tor-*-win32.exe
 /coverage_html/
+/callgraph/
 
 # /contrib/
 /contrib/dist/tor.sh
diff --git a/Makefile.am b/Makefile.am
index f1f64f210..3982f1e8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,6 +224,10 @@ check-changes:
 update-versions:
$(PERL) $(top_builddir)/scripts/maint/updateVersions.pl
 
+.PHONY: callgraph
+callgraph:
+   $(top_builddir)/scripts/maint/run_calltool.sh
+
 version:
@echo "Tor @VERSION@"
@if test -d "$(top_srcdir)/.git" && test -x "`which git 2>&1;true`"; 
then \
diff --git a/changes/19037 b/changes/19037
new file mode 100644
index 0..35f323f1b
--- /dev/null
+++ b/changes/19037
@@ -0,0 +1,7 @@
+  o Minor features (development support):
+- Developers can now generate a call-graph for Tor using the
+  "calltool" python program, which post-processes object dumps.  It
+  should work okay on many Linux and OSX platforms, and might work
+  elsewhere too.  To run this, install calltool from
+  https://gitweb.torproject.org/user/nickm/calltool.git and run
+  "make callgraph". Closes ticket 19307.
diff --git a/scripts/maint/run_calltool.sh b/scripts/maint/run_calltool.sh
new file mode 100755
index 0..f7fa0c305
--- /dev/null
+++ b/scripts/maint/run_calltool.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# You can find calltool at 
https://gitweb.torproject.org/user/nickm/calltool.git
+
+set -e
+
+if test "x$CALLTOOL_PATH" != "x"; then
+  PYTHONPATH="${CALLTOOL_PATH}:${PYTHONPATH}"
+  export PYTHONPATH
+fi
+
+mkdir -p callgraph
+
+SUBITEMS="fn_invgraph fn_scc fn_scc_weaklinks module_graph module_invgraph 
module_scc module_scc_weaklinks"
+
+for calculation in $SUBITEMS; do
+  echo " $calculation"
+  python -m calltool $calculation > callgraph/$calculation
+done
+
+echo < callgraph/README
+This directory holds output from calltool, as run on Tor.  For more
+information about each of these files, see the NOTES and README files in
+the calltool distribution.
+
+You can find calltool at
+https://gitweb.torproject.org/user/nickm/calltool.git
+EOF
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'calltool'

2017-09-07 Thread nickm

commit 12df7a478c3b7f6af1f37257773ee885afebaccc
Merge: 8421756da 283be00b0
Author: Nick Mathewson 
Date:   Thu Sep 7 10:51:25 2017 -0400

Merge branch 'calltool'

 .gitignore|  1 +
 Makefile.am   |  4 
 changes/19037 |  7 +++
 scripts/maint/run_calltool.sh | 29 +
 4 files changed, 41 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Describe actual use of NETINFO fields

2017-09-07 Thread nickm

commit d2bdea61f788beb6c31d33e7a4dad8c98c075918
Author: Nick Mathewson 
Date:   Thu Sep 7 10:09:11 2017 -0400

Describe actual use of NETINFO fields

Instead of saying the clock skew and "your address" fields are
unused, describe the dangers of using them as unconditionally
trusted.
---
 tor-spec.txt | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tor-spec.txt b/tor-spec.txt
index 3431ca5..f7bd546 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -712,8 +712,11 @@ see tor-design.pdf.
 
Implementations MAY use the timestamp value to help decide if their
clocks are skewed.  Initiators MAY use "other OR's address" to help
-   learn which address their connections are originating from, if they do
-   not know it.  [As of 0.2.3.1-alpha, nodes use neither of these values.]
+   learn which address their connections may be originating from, if they do
+   not know it; and to learn whether the peer will treat the current
+   connection as canonical.  Implementations SHOULD NOT trust these
+   values unconditionally, especially when they come from non-authorities,
+   since the other party can lie about the time or IP addresses it sees.
 
Initiators SHOULD use "this OR's address" to make sure
that they have connected to another OR at its canonical address.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Bump alpha version to 0.3.1.6-rc

2017-09-07 Thread hiro

commit 88b17d9e069ab2bc704e08809777896b4d41b473
Author: Nick Mathewson 
Date:   Tue Sep 5 10:12:58 2017 -0400

Bump alpha version to 0.3.1.6-rc
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 56452394..584ad168 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.3.0.10
-export DEVTAG=tor-0.3.1.5-alpha
+export DEVTAG=tor-0.3.1.6-rc
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 6e11eba7..1740e025 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.3.0.10
-0.3.1.5-alpha
+0.3.1.6-rc
 
 0.3.0.10
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix typo in url in press article

2017-09-07 Thread hiro

commit 72eb2dcfa4b5fa5df5e7591159f1e673d192e32a
Author: hiromipaw 
Date:   Thu Aug 31 18:46:56 2017 +0200

Fix typo in url in press article
---
 press/en/press.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/press/en/press.wml b/press/en/press.wml
index 6089c1d4..cb642cb1 100644
--- a/press/en/press.wml
+++ b/press/en/press.wml
@@ -65,7 +65,7 @@ some of the significant Tor-related stories that have popped 
up.
 
 2017 Aug 17
 CNET
-Tor
 Project 'disgusted' by Daily Stormer, defends software ethos
+https://www.cnet.com/g00/news/tor-project-disgusted-by-daily-stormer-defends-software-ethos-nazi-racist;>Tor
 Project 'disgusted' by Daily Stormer, defends software ethos
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

2017-09-07 Thread hiro

commit 616edbb9b49fe160dd517fde066b472390548536
Merge: 1b806313 88b17d9e
Author: hiromipaw 
Date:   Thu Sep 7 15:56:40 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 Makefile   |  2 +-
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 3 files changed, 16 insertions(+), 12 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.0.5

2017-09-07 Thread hiro

commit 815a9f49bb1d855c4644cd976cc381669ba0c430
Author: Nicolas Vigier 
Date:   Mon Sep 4 18:53:04 2017 +0200

Add new Tor Browser version: 7.0.5
---
 include/versions.wmi   | 20 ++--
 projects/torbrowser/RecommendedTBBVersions |  4 
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 5319a08e..6e11eba7 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -5,24 +5,24 @@
 
 maint-7.0
 
-7.0.4
-2017-08-08
+7.0.5
+2017-09-04
 7.5a4
 2017-08-08
 
-7.0.4
-2017-08-08
-7.0.4
-2017-08-08
+7.0.5
+2017-09-04
+7.0.5
+2017-09-04
 7.5a4
 2017-08-08
 7.5a4
 2017-08-08
 
-7.0.4
-2017-08-08
-7.0.4
-2017-08-08
+7.0.5
+2017-09-04
+7.0.5
+2017-09-04
 7.5a4
 2017-08-08
 0.0.12
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index fdf796fe..71006442 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "7.0.4-MacOS",
 "7.0.4-Windows",
 "7.0.4-Linux",
+"7.0.5",
+"7.0.5-MacOS",
+"7.0.5-Windows",
+"7.0.5-Linux",
 "7.5a4",
 "7.5a4-MacOS",
 "7.5a4-Windows",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix torbutton missing jquery error

2017-09-07 Thread hiro

commit 1b8063138301abf86c961c35417cd0bfb48b79e5
Author: hiromipaw 
Date:   Thu Sep 7 15:56:35 2017 +0200

Fix torbutton missing jquery error
---
 docs/torbutton/en/index.wml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/torbutton/en/index.wml b/docs/torbutton/en/index.wml
index c8fe7a44..18f5157e 100644
--- a/docs/torbutton/en/index.wml
+++ b/docs/torbutton/en/index.wml
@@ -14,6 +14,8 @@
 
 
 
+
+
 
 
 Torbutton



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] add android os dev job

2017-09-07 Thread hiro

commit 9656a69e8fe8b005eae100928c84833f894ffa25
Author: hiromipaw 
Date:   Fri Aug 25 12:45:52 2017 +0200

add android os dev job
---
 about/en/jobs-osdeveloperandroid.wml | 139 +++
 1 file changed, 139 insertions(+)

diff --git a/about/en/jobs-osdeveloperandroid.wml 
b/about/en/jobs-osdeveloperandroid.wml
new file mode 100644
index ..1ef85c08
--- /dev/null
+++ b/about/en/jobs-osdeveloperandroid.wml
@@ -0,0 +1,139 @@
+## translation metadata
+# Revision: $Revision: 25666 $
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor Project: Jobs (os developer android)" 
CHARSET="UTF-8"
+
+   
+Home  
+About  
+Jobs
+  
+   
+ The Tor Project is looking for an Android OS developer!
+(Posted 27 Jul 2017)
+
+
+August23, 2017
+
+
+The Tor Project is looking for an Android OS Developer!
+
+
+ As an Android OS Developer, your job will be to work closely with other
+ members of the development team to build and release a Tor Browser for
+ Android with functionality and build processes in parity with the desktop
+ browser. This is a full-time position.
+
+
+ Being a Tor developer includes triaging, diagnosing, and fixing bugs;
+ looking for and resolving mobile privacy issues; responding on short
+ notice to urgent security issues; and working collaboratively with
+ coworkers and volunteers to implement new features and mobile behavior
+ changes. We also need help making our code more maintainable, testable,
+ and mergeable by upstream. The person in this position will review other
+ people's code, designs, and academic research papers to make suggestions
+ for improvement.
+
+
+This position will also focus on the following tasks/projects:
+
+   
+ Design TorService API/integration with Fennec Mobile Android Java 
code.
+   
+   
+  Automate a continuous build process.
+
+   
+   Make Tor Browser for Android a standalone application by porting the 
Orbot connection to Tor. 
+
+   
+  Create a Gradle-dependent standalone Tor Service Library for Android.
 
+
+   
+  Coordinate uplifting of mobile patches. 
+
+
+
+Required Qualifications:
+
+
+  5+ years experience with developing and testing Java/JNI, Android APIs, 
and library dependencies.
+
+   
+ Experience with process management services on Android.
+   
+   
+ Experience with Android Software Development Kit (SDK).
+   
+   
+ Experience in cross-compiling Linux/C/C++ code and libraries to 
mobile devices via Android Native Development Kit (NDK).
+   
+   
+ Experience using network traffic capture and monitoring tools 
(Wireshark, PCAP).
+   
+   
+ Test writing in Espresso, Robotum, JUnit, and/or comparable 
environment.
+   
+   
+ Good interpersonal and open-source collaboration skills.
+   
+
+
+Desired qualifications:
+
+   
+ Experience with reproducible builds on desktop or mobile.
+   
+   
+ User interface and usability skills (nice, but not essential for this 
role). 
+   
+   
+ Shipped public applications with NDK features.
+
+   
+ Experience with Rust and Go on Android.
+
+   
+ Automated testing and continuous integration using cloud based 
services.
+
+   
+ Network knowledge and/or experience; experience investigating leaks.
+
+
+
+Other notes:
+
+
+Academic degrees are great, but not required if you have the right experience!
+
+
+The team coordinates via IRC, email, and bug trackers. This position may be 
performed remotely, but we would be happy to provide a desk at our office in 
Seattle, Washington. We also have informal shared workspace arrangements in NYC 
and San Francisco.
+
+
+The Tor Project, Inc., is a 501(c)(3) non-profit organization that provides 
the technical infrastructure for privacy protection over the Internet. With 
paid staff and contractors of around 30 technologists and operational support 
people, plus many volunteers all over the world who contribute to our work, the 
Tor Project is funded in part by government grants and contracts, as well as by 
individual, foundation, and corporate donations. We only write free and open 
source software, and we don't believe in software patents.
+
+
+The Tor Project has a competitive benefits package, including a generous PTO 
policy; 14 paid holidays per year (including the week between Christmas and New 
Year's, when the office is closed); health, vision, dental, disability, and 
life insurance paid in full for employee; flexible work schedule; and 
occasional travel opportunities.
+
+
+The Tor Project, Inc., is an equal opportunity, affirmative action employer.
+
+
+To apply:
+
+
+Please email a PDF of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet

[tor-commits] [webwml/staging] Update press release

2017-09-07 Thread hiro

commit a74316fe9095a52ae9888324720305cdc9c5ac9d
Author: hiromipaw 
Date:   Thu Aug 31 18:26:45 2017 +0200

Update press release
---
 press/en/press.wml | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/press/en/press.wml b/press/en/press.wml
index 7d0ac691..41b57609 100644
--- a/press/en/press.wml
+++ b/press/en/press.wml
@@ -51,6 +51,29 @@ some of the significant Tor-related stories that have popped 
up.
 
 
 
+2017 Aug 30
+Motherboard
+https://motherboard.vice.com/amp/en_us/article/vbbjxm/here-are-the-41-websites-you-cant-access-in-cuba;>Here
 Are the 41 Websites You Can't Access in Cuba
+
+
+
+2017 Aug 18
+Fast Company
+https://www.fastcompany.com/40455652/the-tor-project-wont-censor-the-daily-stormer-heres-why;>The
 Tor Project won't censor the Daily Stormer - here's why
+
+
+
+2017 Aug 17,CNET
+Tor
 Project 'disgusted' by Daily Stormer, defends software ethos
+
+
+
+2017 Jul 29
+The Register
+https://www.theregister.co.uk/2017/07/29/tor_dark_web/;>Dark web 
doesn't exist
+
+
+
 2017 Jul 20
 Venture Beat
 https://venturebeat.com/2017/07/20/the-tor-project-launches-its-first-public-bug-bounty-program-through-hackerone/;>Tor
 Project Opens Bug The Tor Project launches its first public bug bounty program 
through HackerOne



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Add link in jobs page

2017-09-07 Thread hiro

commit e636f1bdb606f67a3c30fbce85245c24bc526ca4
Author: hiromipaw 
Date:   Fri Aug 25 12:52:48 2017 +0200

Add link in jobs page
---
 about/en/jobs.wml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 86d8eac9..d841c1aa 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -20,6 +20,7 @@

  Browser 
Developer
  Browser 
Developers for Mobile (Android)
+ Android OS 
developer

 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix typo in press release

2017-09-07 Thread hiro

commit 52aaa12090215e5468419fd04c72aa8c52413409
Author: hiromipaw 
Date:   Thu Aug 31 18:46:01 2017 +0200

Fix typo in press release
---
 press/en/press.wml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/press/en/press.wml b/press/en/press.wml
index 41b57609..6089c1d4 100644
--- a/press/en/press.wml
+++ b/press/en/press.wml
@@ -63,7 +63,8 @@ some of the significant Tor-related stories that have popped 
up.
 
 
 
-2017 Aug 17,CNET
+2017 Aug 17
+CNET
 Tor
 Project 'disgusted' by Daily Stormer, defends software ethos
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix typos

2017-09-07 Thread hiro

commit 8c2873b1bbf4a5d418dceaf951d6d23b07b0e695
Author: hiromipaw 
Date:   Fri Aug 25 13:04:21 2017 +0200

Fix typos
---
 about/en/jobs.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index d841c1aa..835d2b98 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -20,7 +20,7 @@

  Browser 
Developer
  Browser 
Developers for Mobile (Android)
- Android OS 
developer
+ Android OS 
Developer

 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Merge branch 'master' into staging

2017-09-07 Thread hiro

commit a478b99ef1fc09162efd8f12be6c6e71de34d255
Merge: 56a20c47 616edbb9
Author: hiromipaw 
Date:   Thu Sep 7 15:57:00 2017 +0200

Merge branch 'master' into staging

 Makefile   |   2 +-
 about/en/jobs-browserdeveloper.wml |   1 -
 about/en/jobs-developerandroid.wml |   3 +-
 about/en/jobs-osdeveloperandroid.wml   | 139 +
 about/en/jobs.wml  |   2 +-
 docs/torbutton/en/index.wml|   2 +
 include/versions.wmi   |  22 ++---
 press/en/press.wml |  24 +
 projects/torbrowser/RecommendedTBBVersions |   4 +
 9 files changed, 183 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix posting date for os android dev

2017-09-07 Thread hiro

commit 520780ca66f1afcad3d4bf233bd5f96905e2fde4
Author: hiromipaw 
Date:   Fri Aug 25 12:54:02 2017 +0200

Fix posting date for os android dev
---
 about/en/jobs-osdeveloperandroid.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs-osdeveloperandroid.wml 
b/about/en/jobs-osdeveloperandroid.wml
index 1ef85c08..0ac17e2f 100644
--- a/about/en/jobs-osdeveloperandroid.wml
+++ b/about/en/jobs-osdeveloperandroid.wml
@@ -11,10 +11,10 @@
   

  The Tor Project is looking for an Android OS developer!
-(Posted 27 Jul 2017)
+(Posted 23 Aug 2017)
 
 
-August23, 2017
+August 23, 2017
 
 
 The Tor Project is looking for an Android OS Developer!



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Remove browser dev pos and small change to other posts

2017-09-07 Thread hiro

commit afb254b1cd6b1db92fe76537e3361dbdb637c230
Author: hiromipaw 
Date:   Tue Aug 29 11:32:41 2017 +0200

Remove browser dev pos and small change to other posts
---
 about/en/jobs-developerandroid.wml   | 2 +-
 about/en/jobs-osdeveloperandroid.wml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs-developerandroid.wml 
b/about/en/jobs-developerandroid.wml
index bd8a48d1..af5fb206 100644
--- a/about/en/jobs-developerandroid.wml
+++ b/about/en/jobs-developerandroid.wml
@@ -115,7 +115,7 @@ The Tor Project, Inc., is an equal opportunity, affirmative 
action employer.
 To apply:
 
 
-Please email a PDF of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description, 
including why you want to work on Tor. Email should be sent to hr at 
torproject.org with "Browser Developer" in the subject line.
+Please email a PDF of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description, 
including why you want to work on Tor. Email should be sent to hr at 
torproject.org with "Browser Developer for Mobile (Android)" in the subject 
line.
 Link to at least one of your code samples (ideally, more than one and all of 
which we will presume you are authorized to disclose). No phone calls, please!
 
 
diff --git a/about/en/jobs-osdeveloperandroid.wml 
b/about/en/jobs-osdeveloperandroid.wml
index 0ac17e2f..7c7c4e60 100644
--- a/about/en/jobs-osdeveloperandroid.wml
+++ b/about/en/jobs-osdeveloperandroid.wml
@@ -123,7 +123,7 @@ The Tor Project, Inc., is an equal opportunity, affirmative 
action employer.
 To apply:
 
 
-Please email a PDF of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description, 
including why you want to work on Tor. Email should be sent to hr at 
torproject.org with "Browser Developer" in the subject line.
+Please email a PDF of your resume/CV, and a cover letter explaining how your 
qualifications and experience meet the requirements of this job description, 
including why you want to work on Tor. Email should be sent to hr at 
torproject.org with "OS Developer Android" in the subject line.
 Link to at least one of your code samples (ideally, more than one and all of 
which we will presume you are authorized to disclose). No phone calls, please!
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Escaping equals sign in viewport

2017-09-07 Thread hiro

commit 56a20c470b33480e8f453defbada60c3cc3a81d9
Author: hiromipaw 
Date:   Thu Aug 24 16:16:17 2017 +0200

Escaping equals sign in viewport
---
 Makefile.common  |  1 -
 en/index.wml |  1 +
 include/head.wmi | 10 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index f42670e6..ce2c22c2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -26,7 +26,6 @@ WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) 
$(WMLBASE)/include/*.wmi )
 HTMLFILES=$(shell perl -le 's,  (.*)/(.*).wml  ,$$2.html.$$1,x, 
print $$_ for @ARGV' $(WMLFILES))
 DEPFILES=$(shell perl -le 's,  (.*)/(.*).wml  ,  .deps/$$2.html.$$1.d  ,x, 
print $$_ for @ARGV' $(WMLFILES))
 
-
 all: $(HTMLFILES)
 
 %.html.en: en/%.wml
diff --git a/en/index.wml b/en/index.wml
index c9cacf29..4a76adf3 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -4,6 +4,7 @@
 
 #include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8"
 
+
 
 

diff --git a/include/head.wmi b/include/head.wmi
index 9d631a85..dc4d5e26 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -6,18 +6,22 @@
 #use "versions.wmi"
 #use "navigation.wmi"
 
+
+
+
+
+
 
  
  
 


-   
+   

mailto:get...@torproject.org] for 
help downloading Tor Browser.">

https://www.torproject.org/images/tor-logo.jpg;>
-   https://static-na.payments-amazon.com;>
 {#meta#}
 
$(TITLE)
@@ -40,7 +44,7 @@

- #  
+   #  
# end WML to generate css/js paths
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Note that Nima took Alison's photo

2017-09-07 Thread hiro

commit ab6a050e8d96978fb05405c8d297a39a6c371b30
Author: Damian Johnson 
Date:   Wed Aug 9 12:54:35 2017 -0700

Note that Nima took Alison's photo

Request from Nima so it meets the CC-by license.
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 72f5a682..37b92971 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -78,7 +78,7 @@ table.people tr td:first-child {
   
 
   
-  
+  
   https://twitter.com/flexlibris;>
   https://db.torproject.org/fetchkey.cgi?fingerprint=FBF0E7DB1433018EE52D0DDA9FC34089CBE83CA3;>
   Alison Macrina



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix tag

2017-09-07 Thread hiro

commit 2461403633b36018b0c1fa1d39c6548917391454
Author: hiromipaw 
Date:   Fri Aug 25 12:46:25 2017 +0200

Fix tag
---
 about/en/jobs-developerandroid.wml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/about/en/jobs-developerandroid.wml 
b/about/en/jobs-developerandroid.wml
index de73b049..bd8a48d1 100644
--- a/about/en/jobs-developerandroid.wml
+++ b/about/en/jobs-developerandroid.wml
@@ -59,7 +59,6 @@ This is a full-time position.
 
 Preferred qualifications:
 
-   

  Familiarity and/or experience with writing add-ons and/or patches for 
Mozilla Firefox or other web browsers.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Escaping equals sign in viewport

2017-09-07 Thread hiro

commit e670475bcd5d84bfcc58440469d20c5280dfc800
Author: hiromipaw 
Date:   Thu Aug 24 16:21:44 2017 +0200

Escaping equals sign in viewport
---
 include/head.wmi | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/head.wmi b/include/head.wmi
index 57081b2c..dc4d5e26 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -6,18 +6,22 @@
 #use "versions.wmi"
 #use "navigation.wmi"
 
+
+
+
+
+
 
  
  
 


-   
+   

mailto:get...@torproject.org] for 
help downloading Tor Browser.">

https://www.torproject.org/images/tor-logo.jpg;>
-   
 {#meta#}
 
$(TITLE)
@@ -40,7 +44,7 @@

- #  
+   #  
# end WML to generate css/js paths
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix tag again

2017-09-07 Thread hiro

commit 3baf0eec9c1c2b72686c18ec2d56f8070a58ff04
Author: hiromipaw 
Date:   Fri Aug 25 12:47:21 2017 +0200

Fix tag again
---
 about/en/jobs-browserdeveloper.wml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/about/en/jobs-browserdeveloper.wml 
b/about/en/jobs-browserdeveloper.wml
index 413ffe97..dd119245 100644
--- a/about/en/jobs-browserdeveloper.wml
+++ b/about/en/jobs-browserdeveloper.wml
@@ -56,7 +56,6 @@ This is a full-time position.
 
 Preferred qualifications:
 
-   

 Familiarity and/or experience with writing add-ons and/or patches for 
Mozilla Firefox or other web browsers.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml into staging

2017-09-07 Thread hiro

commit 7bf7ad9ebe1628193b1c5f9e3f2a455fd6fd282e
Merge: 646ccefe 52c29243
Author: hiromipaw 
Date:   Mon Aug 14 14:39:21 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml 
into staging

 about/en/corepeople.wml|  2 +-
 about/en/sponsors.wml  | 16 +--
 include/versions.wmi   | 44 +++---
 projects/torbrowser/RecommendedTBBVersions | 18 ++--
 4 files changed, 39 insertions(+), 41 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Fix to jobs page

2017-09-07 Thread hiro

commit b899b04a54ce48236dff9efa6a7c717886938e5c
Author: hiromipaw 
Date:   Tue Aug 29 11:55:01 2017 +0200

Fix to jobs page
---
 about/en/jobs.wml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 835d2b98..38e225b9 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -18,7 +18,6 @@
 
Specifically, we're looking for the following people 
currently:

- Browser 
Developer
  Browser 
Developers for Mobile (Android)
  Android OS 
Developer




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

2017-09-07 Thread hiro

commit 7e3fccb40a7c619f44845b5495bfab411141b777
Merge: e670475b 52c29243
Author: hiromipaw 
Date:   Thu Aug 24 16:21:48 2017 +0200

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/corepeople.wml|  2 +-
 about/en/sponsors.wml  | 16 +--
 include/versions.wmi   | 44 +++---
 projects/torbrowser/RecommendedTBBVersions | 18 ++--
 4 files changed, 39 insertions(+), 41 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.5a4

2017-09-07 Thread hiro

commit 1f6893aa8864843ff00a574c8e92482e2d5a1384
Author: Nicolas Vigier 
Date:   Tue Aug 8 19:31:31 2017 +0200

Add new Tor Browser version: 7.5a4
---
 include/versions.wmi   | 18 +-
 projects/torbrowser/RecommendedTBBVersions |  6 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 787a4c5a..5319a08e 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -7,25 +7,25 @@
 
 7.0.4
 2017-08-08
-7.5a2
-2017-07-06
+7.5a4
+2017-08-08
 
 7.0.4
 2017-08-08
 7.0.4
 2017-08-08
-7.5a3
-2017-07-28
-7.5a3
-2017-07-28
+7.5a4
+2017-08-08
+7.5a4
+2017-08-08
 
 7.0.4
 2017-08-08
 7.0.4
 2017-08-08
-7.5a2
-2017-07-06
-0.0.9
+7.5a4
+2017-08-08
+0.0.12
 
 ../dist/torbrowser//tor-win32-.zip
 
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index bf33ec2c..5944b1cc 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -12,5 +12,9 @@
 "7.5a2-MacOS",
 "7.5a2-Windows",
 "7.5a3",
-"7.5a3-Linux"
+"7.5a3-Linux",
+"7.5a4",
+"7.5a4-MacOS",
+"7.5a4-Windows",
+"7.5a4-Linux"
 ]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] almost all funders have https now!

2017-09-07 Thread hiro

commit eed4c40eb6abd3a6c4f3787a0f4a81b04a183568
Author: Roger Dingledine 
Date:   Thu Aug 10 01:14:49 2017 -0400

almost all funders have https now!

...the media democracy fund being the exception
---
 about/en/sponsors.wml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index a0cc9268..37c6fdbe 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -26,18 +26,18 @@
 Active Sponsors in 2017:
   
  Tens of thousands of personal 
donations from individuals like you (2006-present)
- http://code.google.com/soc/;>Google Summer of Code 
(2007-2014 and 2016-2017)
+ https://developers.google.com/open-source/gsoc/;>Google 
Summer of Code (2007-2014 and 2016-2017)
  https://www.mozilla.org/en-US/moss/;>Mozilla 
(2016-2017)
  https://www.opentech.fund/;>Open Technology Fund 
(2012-2017)
  http://mediademocracyfund.org/;>Media Democracy Fund 
(2016-2017)
- http://nsf.gov/;>National Science Foundation joint 
with Princeton University (2012-2018)
- http://nsf.gov/;>National Science Foundation via 
University of Minnesota (2013-2018)
- http://nsf.gov/;>National Science Foundation joint 
with Georgetown (2015-2018)
- http://nsf.gov/;>National Science Foundation joint 
with Rochester Institute of Technology (2016-2019)
- http://nsf.gov/;>National Science Foundation joint 
with University of Illinois at Chicago (2016-2018)
+ https://nsf.gov/;>National Science Foundation joint 
with Princeton University (2012-2018)
+ https://nsf.gov/;>National Science Foundation via 
University of Minnesota (2013-2018)
+ https://nsf.gov/;>National Science Foundation joint 
with Georgetown (2015-2018)
+ https://nsf.gov/;>National Science Foundation joint 
with Rochester Institute of Technology (2016-2019)
+ https://nsf.gov/;>National Science Foundation joint 
with University of Illinois at Chicago (2016-2018)
  https://www.fastly.com/;>Fastly (2016-2017)
- http://www.sri.com/;>SRI International 
(2011-2017)
- http://www.state.gov/j/drl/;>US Department of State 
Bureau of Democracy, Human Rights, and Labor (2013-2018)
+ https://www.sri.com/;>SRI International 
(2011-2017)
+ https://www.state.gov/j/drl/;>US Department of State 
Bureau of Democracy, Human Rights, and Labor (2013-2018)
  https://www.team-cymru.org/;>Team Cymru 
(2009-present)
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Remove deprecated Tor Browser versions

2017-09-07 Thread hiro

commit 52c29243a398db421d9ed543af831dc13490ec64
Author: Nicolas Vigier 
Date:   Fri Aug 11 11:19:58 2017 +0200

Remove deprecated Tor Browser versions
---
 projects/torbrowser/RecommendedTBBVersions | 10 --
 1 file changed, 10 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 5944b1cc..fdf796fe 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -1,18 +1,8 @@
 [
-"7.0.2",
-"7.0.2-MacOS",
-"7.0.2-Windows",
-"7.0.3",
-"7.0.3-Linux",
 "7.0.4",
 "7.0.4-MacOS",
 "7.0.4-Windows",
 "7.0.4-Linux",
-"7.5a2",
-"7.5a2-MacOS",
-"7.5a2-Windows",
-"7.5a3",
-"7.5a3-Linux",
 "7.5a4",
 "7.5a4-MacOS",
 "7.5a4-Windows",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] two nsf projects got no-cost-extensions, plus new drl grant

2017-09-07 Thread hiro

commit 3d5e87a871b998514c2fdd7fa5eb615a69d27fbc
Author: Roger Dingledine 
Date:   Thu Aug 10 01:13:05 2017 -0400

two nsf projects got no-cost-extensions, plus new drl grant
---
 about/en/sponsors.wml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 0147926a..a0cc9268 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -30,14 +30,14 @@
  https://www.mozilla.org/en-US/moss/;>Mozilla 
(2016-2017)
  https://www.opentech.fund/;>Open Technology Fund 
(2012-2017)
  http://mediademocracyfund.org/;>Media Democracy Fund 
(2016-2017)
- http://nsf.gov/;>National Science Foundation joint 
with Princeton University (2012-2017)
- http://nsf.gov/;>National Science Foundation via 
University of Minnesota (2013-2017)
+ http://nsf.gov/;>National Science Foundation joint 
with Princeton University (2012-2018)
+ http://nsf.gov/;>National Science Foundation via 
University of Minnesota (2013-2018)
  http://nsf.gov/;>National Science Foundation joint 
with Georgetown (2015-2018)
  http://nsf.gov/;>National Science Foundation joint 
with Rochester Institute of Technology (2016-2019)
  http://nsf.gov/;>National Science Foundation joint 
with University of Illinois at Chicago (2016-2018)
  https://www.fastly.com/;>Fastly (2016-2017)
  http://www.sri.com/;>SRI International 
(2011-2017)
- http://www.state.gov/j/drl/;>US Department of State 
Bureau of Democracy, Human Rights, and Labor (2013-2016)
+ http://www.state.gov/j/drl/;>US Department of State 
Bureau of Democracy, Human Rights, and Labor (2013-2018)
  https://www.team-cymru.org/;>Team Cymru 
(2009-present)
   
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Add new Tor Browser version: 7.0.4

2017-09-07 Thread hiro

commit 146eddb66e39038bd82cfd6f3ff48208fcab091e
Author: Nicolas Vigier 
Date:   Tue Aug 8 18:39:32 2017 +0200

Add new Tor Browser version: 7.0.4
---
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index de346cdc..787a4c5a 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,28 +1,28 @@
 0.3.0.10
 0.3.1.5-alpha
 
-0.3.0.9
+0.3.0.10
 
 maint-7.0
 
-7.0.2
-2017-07-04
+7.0.4
+2017-08-08
 7.5a2
 2017-07-06
 
-7.0.3
-2017-07-27
-7.0.3
-2017-07-27
+7.0.4
+2017-08-08
+7.0.4
+2017-08-08
 7.5a3
 2017-07-28
 7.5a3
 2017-07-28
 
-7.0.2
-2017-07-04
-7.0.2
-2017-07-04
+7.0.4
+2017-08-08
+7.0.4
+2017-08-08
 7.5a2
 2017-07-06
 0.0.9
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 70f931a6..bf33ec2c 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -4,6 +4,10 @@
 "7.0.2-Windows",
 "7.0.3",
 "7.0.3-Linux",
+"7.0.4",
+"7.0.4-MacOS",
+"7.0.4-Windows",
+"7.0.4-Linux",
 "7.5a2",
 "7.5a2-MacOS",
 "7.5a2-Windows",



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Remove section 5.4.5.

2017-09-07 Thread nickm

commit 0951a931f66b5389027e900aaa1af01e81db634f
Author: Nick Mathewson 
Date:   Thu Sep 7 09:40:06 2017 -0400

Remove section 5.4.5.

This section made sense with the v2 networkstatus algorithm, but we
haven't used that one for years and years.
---
 dir-spec.txt | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 3c57fb8..20416a6 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -3502,21 +3502,6 @@ The following methods have incorrect implementations; 
authorities SHOULD
 
...
 
-5.4.5. Router protocol versions
-
-   A client should believe that a router supports a given feature if that
-   feature is supported by the router or protocol versions in more than half
-   of the live networkstatuses' "v" entries for that router.  In other words,
-   if the "v" entries for some router are:
-   v Tor 0.0.8pre1(from authority 1)
-   v Tor 0.1.2.11 (from authority 2)
-   v FutureProtocolDescription 99 (from authority 3)
-   then the client should believe that the router supports any feature
-   supported by 0.1.2.11.
-
-   This is currently equivalent to believing the median declared version for
-   a router in all live networkstatuses.
-
 6. Standards compliance
 
All clients and servers MUST support HTTP 1.0.  Clients and servers MAY

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Talk about assertions in CodingStandards.md

2017-09-07 Thread nickm

commit 8421756da3fc3cc116d17fe96b50384c0d79af8b
Author: Nick Mathewson 
Date:   Thu Sep 7 09:37:39 2017 -0400

Talk about assertions in CodingStandards.md
---
 doc/HACKING/CodingStandards.md | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md
index 55c23a7df..a8fca4a77 100644
--- a/doc/HACKING/CodingStandards.md
+++ b/doc/HACKING/CodingStandards.md
@@ -249,7 +249,25 @@ end-users that they aren't expected to understand the 
message (perhaps
 with a string like "internal error"). Option (A) is to be preferred to
 option (B).
 
+Assertions In Tor
+-
 
+Assertions should be used for bug-detection only.  Don't use assertions to
+detect bad user inputs, network errors, resource exhaustion, or similar
+issues.
+
+Tor is always built with assertions enabled, so try to only use
+`tor_assert()` for cases where you are absolutely sure that crashing is the
+least bad option.  Many bugs have been caused by use of `tor_assert()` when
+another kind of check would have been safer.
+
+If you're writing an assertion to test for a bug that you _can_ recover from,
+use `tor_assert_nonfatal()` in place of `tor_assert()`.  If you'd like to
+write a conditional that incorporates a nonfatal assertion, use the `BUG()`
+macro, as in:
+
+   if (BUG(ptr == NULL))
+   return -1;
 
 Doxygen comment conventions
 ---

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add a module comment to util_bug.h

2017-09-07 Thread nickm

commit 1502bf03fdf8255d4673cc529e02ad69cef9995d
Author: Nick Mathewson 
Date:   Thu Sep 7 09:31:30 2017 -0400

Add a module comment to util_bug.h

Closes ticket 22824.
---
 src/common/util_bug.h | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index de39317d1..ce6565d92 100644
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -5,6 +5,32 @@
 
 /**
  * \file util_bug.h
+ *
+ * \brief Macros to manage assertions, fatal and non-fatal.
+ *
+ * Guidelines: All the different kinds of assertion in this file are for
+ * bug-checking only. Don't write code that can assert based on bad inputs.
+ *
+ * We provide two kinds of assertion here: "fatal" and "nonfatal". Use
+ * nonfatal assertions for any bug you can reasonably recover from -- and
+ * please, try to recover!  Many severe bugs in Tor have been caused by using
+ * a regular assertion when a nonfatal assertion would have been better.
+ *
+ * If you need to check a condition with a nonfatal assertion, AND recover
+ * from that same condition, consider using the BUG() macro inside a
+ * conditional.  For example:
+ *
+ * 
+ *  // wrong -- use tor_assert_nonfatal() if you just want an assertion.
+ *  BUG(ptr == NULL);
+ *
+ *  // okay, but needlessly verbose
+ *  tor_assert_nonfatal(ptr != NULL);
+ *  if (ptr == NULL) { ... }
+ *
+ *  // this is how we do it:
+ *  if (BUG(ptr == NULL)) { ... }
+ * 
  **/
 
 #ifndef TOR_UTIL_BUG_H



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Mention link protocol 5 in section 9.1

2017-09-07 Thread nickm

commit 5772170591a11bcdb2ef7ac2675790614c184896
Author: Nick Mathewson 
Date:   Thu Sep 7 09:02:11 2017 -0400

Mention link protocol 5 in section 9.1

Closes ticket 22918.
---
 tor-spec.txt | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tor-spec.txt b/tor-spec.txt
index 600d457..3431ca5 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -1701,9 +1701,10 @@ see tor-design.pdf.
Two Tor instances can make a connection to each other only if they have at
least one link protocol in common.
 
-   The current "link" versions are: "1" through "4". See section 4.1 for more
-   information. All current Tor versions support "1-3"; version from
-   0.2.4.11-alpha and on support "1-4". Eventually we will drop "1" and "2".
+   The current "link" versions are: "1" through "5". See section 4.1 for more
+   information. All current Tor versions support "1-3"; versions from
+   0.2.4.11-alpha and on support "1-4"; versions from 0.3.1.1-alpha and on
+   support "1-5". Eventually we will drop "1" and "2".
 
 9.2. "LinkAuth"
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Add a stack trace to the warning at issue with 23105.

2017-09-07 Thread nickm

commit 9c404602a0a5dd0b916957f4c456c59defecea13
Author: Nick Mathewson 
Date:   Thu Sep 7 08:49:11 2017 -0400

Add a stack trace to the warning at issue with 23105.

With luck, this will help us diagnose 23105 and fix it.

I also added a stack trace to the warning right before it, since why
not.
---
 changes/bug23105-diagnostic | 4 
 src/or/relay.c  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug23105-diagnostic b/changes/bug23105-diagnostic
new file mode 100644
index 0..8ba4931e3
--- /dev/null
+++ b/changes/bug23105-diagnostic
@@ -0,0 +1,4 @@
+  o Minor features (diagnostic):
+- Add a stack trace to the bug warnings that can be logged when
+  trying to send an outgoing relay cell with n_chan == 0.
+  Diagnostic attempt for bug 23105.
diff --git a/src/or/relay.c b/src/or/relay.c
index 0ff53ed5e..cb1a0692b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -48,6 +48,7 @@
 #define RELAY_PRIVATE
 #include "or.h"
 #include "addressmap.h"
+#include "backtrace.h"
 #include "buffers.h"
 #include "channel.h"
 #include "circpathbias.h"
@@ -511,11 +512,13 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
 if (!chan) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL."
" Dropping.", filename, lineno);
+  log_backtrace(LOG_WARN,LD_BUG,"");
   return 0; /* just drop it */
 }
 if (!CIRCUIT_IS_ORIGIN(circ)) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d on non-origin "
"circ. Dropping.", filename, lineno);
+  log_backtrace(LOG_WARN,LD_BUG,"");
   return 0; /* just drop it */
 }
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

2017-09-07 Thread nickm

commit 1e079ec30db716f92bf944489ec0408daef18d0f
Merge: ae7cb3349 9c404602a
Author: Nick Mathewson 
Date:   Thu Sep 7 08:51:16 2017 -0400

Merge branch 'maint-0.3.1'

 changes/bug23105-diagnostic | 4 
 src/or/relay.c  | 3 +++
 2 files changed, 7 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Add a stack trace to the warning at issue with 23105.

2017-09-07 Thread nickm

commit 9c404602a0a5dd0b916957f4c456c59defecea13
Author: Nick Mathewson 
Date:   Thu Sep 7 08:49:11 2017 -0400

Add a stack trace to the warning at issue with 23105.

With luck, this will help us diagnose 23105 and fix it.

I also added a stack trace to the warning right before it, since why
not.
---
 changes/bug23105-diagnostic | 4 
 src/or/relay.c  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug23105-diagnostic b/changes/bug23105-diagnostic
new file mode 100644
index 0..8ba4931e3
--- /dev/null
+++ b/changes/bug23105-diagnostic
@@ -0,0 +1,4 @@
+  o Minor features (diagnostic):
+- Add a stack trace to the bug warnings that can be logged when
+  trying to send an outgoing relay cell with n_chan == 0.
+  Diagnostic attempt for bug 23105.
diff --git a/src/or/relay.c b/src/or/relay.c
index 0ff53ed5e..cb1a0692b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -48,6 +48,7 @@
 #define RELAY_PRIVATE
 #include "or.h"
 #include "addressmap.h"
+#include "backtrace.h"
 #include "buffers.h"
 #include "channel.h"
 #include "circpathbias.h"
@@ -511,11 +512,13 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
 if (!chan) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL."
" Dropping.", filename, lineno);
+  log_backtrace(LOG_WARN,LD_BUG,"");
   return 0; /* just drop it */
 }
 if (!CIRCUIT_IS_ORIGIN(circ)) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d on non-origin "
"circ. Dropping.", filename, lineno);
+  log_backtrace(LOG_WARN,LD_BUG,"");
   return 0; /* just drop it */
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-09-07 Thread nickm

commit f0fa7a3420d2cfe1a1d28fc06b2e20a491066a1f
Merge: c4ecb8f86 9c404602a
Author: Nick Mathewson 
Date:   Thu Sep 7 08:51:16 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23105-diagnostic | 4 
 src/or/relay.c  | 3 +++
 2 files changed, 7 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add a stack trace to the warning at issue with 23105.

2017-09-07 Thread nickm

commit 9c404602a0a5dd0b916957f4c456c59defecea13
Author: Nick Mathewson 
Date:   Thu Sep 7 08:49:11 2017 -0400

Add a stack trace to the warning at issue with 23105.

With luck, this will help us diagnose 23105 and fix it.

I also added a stack trace to the warning right before it, since why
not.
---
 changes/bug23105-diagnostic | 4 
 src/or/relay.c  | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug23105-diagnostic b/changes/bug23105-diagnostic
new file mode 100644
index 0..8ba4931e3
--- /dev/null
+++ b/changes/bug23105-diagnostic
@@ -0,0 +1,4 @@
+  o Minor features (diagnostic):
+- Add a stack trace to the bug warnings that can be logged when
+  trying to send an outgoing relay cell with n_chan == 0.
+  Diagnostic attempt for bug 23105.
diff --git a/src/or/relay.c b/src/or/relay.c
index 0ff53ed5e..cb1a0692b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -48,6 +48,7 @@
 #define RELAY_PRIVATE
 #include "or.h"
 #include "addressmap.h"
+#include "backtrace.h"
 #include "buffers.h"
 #include "channel.h"
 #include "circpathbias.h"
@@ -511,11 +512,13 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
 if (!chan) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL."
" Dropping.", filename, lineno);
+  log_backtrace(LOG_WARN,LD_BUG,"");
   return 0; /* just drop it */
 }
 if (!CIRCUIT_IS_ORIGIN(circ)) {
   log_warn(LD_BUG,"outgoing relay cell sent from %s:%d on non-origin "
"circ. Dropping.", filename, lineno);
+  log_backtrace(LOG_WARN,LD_BUG,"");
   return 0; /* just drop it */
 }
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'bug23361_032_01_squashed2'

2017-09-07 Thread nickm

commit ae7cb3349e8a159c3144e7d3ea66b9a439d7028e
Merge: ab18e5e5f c527cde82
Author: Nick Mathewson 
Date:   Thu Sep 7 08:35:35 2017 -0400

Merge branch 'bug23361_032_01_squashed2'

 src/or/circuitbuild.c | 28 ++--
 src/or/circuitlist.c  | 32 
 src/or/circuituse.c   | 10 ++
 src/or/circuituse.h   |  3 +++
 src/or/hs_client.c| 17 +++--
 src/or/nodelist.c | 22 ++
 src/or/nodelist.h |  1 +
 src/or/or.h   | 10 +-
 src/or/protover.h |  2 ++
 src/or/routerlist.c   | 16 
 src/or/routerparse.c  |  3 +++
 11 files changed, 131 insertions(+), 13 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] prop224: Pick rendezvous point of protover HSRend=2

2017-09-07 Thread nickm

commit c527cde82f74849ec3b183159d20441019b77e2e
Author: David Goulet 
Date:   Wed Aug 30 10:13:22 2017 -0400

prop224: Pick rendezvous point of protover HSRend=2

Version 3 hidden service needs rendezvous point that have the protocol 
version
HSRend >= 2 else the rendezvous cells are rejected.

Fixes #23361

Signed-off-by: David Goulet 
---
 src/or/circuitbuild.c | 28 ++--
 src/or/circuitlist.c  | 32 
 src/or/circuituse.c   | 10 ++
 src/or/circuituse.h   |  3 +++
 src/or/hs_client.c| 17 +++--
 src/or/nodelist.c | 22 ++
 src/or/nodelist.h |  1 +
 src/or/or.h   | 10 +-
 src/or/protover.h |  2 ++
 src/or/routerlist.c   | 16 
 src/or/routerparse.c  |  3 +++
 11 files changed, 131 insertions(+), 13 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 65cd7bd5d..e5c6767d4 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -71,7 +71,8 @@ static channel_t * channel_connect_for_circuit(const 
tor_addr_t *addr,
 static int circuit_deliver_create_cell(circuit_t *circ,
const create_cell_t *create_cell,
int relayed);
-static int onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit);
+static int onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit,
+ int is_hs_v3_rp_circuit);
 static crypt_path_t *onion_next_hop_in_cpath(crypt_path_t *cpath);
 static int onion_extend_cpath(origin_circuit_t *circ);
 static int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice);
@@ -505,10 +506,15 @@ circuit_establish_circuit(uint8_t purpose, extend_info_t 
*exit_ei, int flags)
 {
   origin_circuit_t *circ;
   int err_reason = 0;
+  int is_hs_v3_rp_circuit = 0;
+
+  if (flags & CIRCLAUNCH_IS_V3_RP) {
+is_hs_v3_rp_circuit = 1;
+  }
 
   circ = origin_circuit_init(purpose, flags);
 
-  if (onion_pick_cpath_exit(circ, exit_ei) < 0 ||
+  if (onion_pick_cpath_exit(circ, exit_ei, is_hs_v3_rp_circuit) < 0 ||
   onion_populate_cpath(circ) < 0) {
 circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_NOPATH);
 return NULL;
@@ -2156,7 +2162,8 @@ pick_rendezvous_node(router_crn_flags_t flags)
  */
 static const node_t *
 choose_good_exit_server(uint8_t purpose,
-int need_uptime, int need_capacity, int is_internal)
+int need_uptime, int need_capacity, int is_internal,
+int need_hs_v3)
 {
   const or_options_t *options = get_options();
   router_crn_flags_t flags = CRN_NEED_DESC;
@@ -2164,6 +2171,8 @@ choose_good_exit_server(uint8_t purpose,
 flags |= CRN_NEED_UPTIME;
   if (need_capacity)
 flags |= CRN_NEED_CAPACITY;
+  if (need_hs_v3)
+flags |= CRN_RENDEZVOUS_V3;
 
   switch (purpose) {
 case CIRCUIT_PURPOSE_C_GENERAL:
@@ -2263,9 +2272,15 @@ warn_if_last_router_excluded(origin_circuit_t *circ,
 
 /** Decide a suitable length for circ's cpath, and pick an exit
  * router (or use exit if provided). Store these in the
- * cpath. Return 0 if ok, -1 if circuit should be closed. */
+ * cpath.
+ *
+ * If is_hs_v3_rp_circuit is set, then this exit should be suitable to
+ * be used as an HS v3 rendezvous point.
+ *
+ * Return 0 if ok, -1 if circuit should be closed. */
 static int
-onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei)
+onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei,
+  int is_hs_v3_rp_circuit)
 {
   cpath_build_state_t *state = circ->build_state;
 
@@ -2289,7 +2304,8 @@ onion_pick_cpath_exit(origin_circuit_t *circ, 
extend_info_t *exit_ei)
   } else { /* we have to decide one */
 const node_t *node =
   choose_good_exit_server(circ->base_.purpose, state->need_uptime,
-  state->need_capacity, state->is_internal);
+  state->need_capacity, state->is_internal,
+  is_hs_v3_rp_circuit);
 if (!node) {
   log_warn(LD_CIRC,"Failed to choose an exit server");
   return -1;
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 2f3fe327e..774edc90b 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1609,6 +1609,30 @@ circuit_get_next_by_pk_and_purpose(origin_circuit_t 
*start,
   return NULL;
 }
 
+/** We might cannibalize this circuit: Return true if its last hop can be used
+ *  as a v3 rendezvous point. */
+static int
+circuit_can_be_cannibalized_for_v3_rp(const origin_circuit_t *circ)
+{
+  if (!circ->build_state) {
+return 0;
+  }
+
+  extend_info_t *chosen_exit = circ->build_state->chosen_exit;
+  if (BUG(!chosen_exit)) {
+return 0;
+  }
+
+  const node_t *rp_node = node_get_by_id(chosen_exit->identity_digest);
+  if (rp_node) {
+if

[tor-commits] [torspec/master] Merge branch 'bug22934'

2017-09-07 Thread nickm

commit 5a3ea37d1584eaa4a5a32181a50d8d6299f02d4f
Merge: ee2ce95 1bbf528
Author: Nick Mathewson 
Date:   Thu Sep 7 08:01:09 2017 -0400

Merge branch 'bug22934'

 tor-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Correct description of which cells are allowed during the handshake

2017-09-07 Thread nickm

commit 1bbf52873ca7d585f36596ae67bc61d49105af12
Author: Nick Mathewson 
Date:   Wed Sep 6 13:45:16 2017 -0400

Correct description of which cells are allowed during the handshake

We said that PADDING was allowed, but it wasn't.

Bug 22934.
---
 tor-spec.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tor-spec.txt b/tor-spec.txt
index 176dfc1..600d457 100644
--- a/tor-spec.txt
+++ b/tor-spec.txt
@@ -504,9 +504,9 @@ see tor-design.pdf.
authenticate or not. If it does not want to authenticate, it MUST
send a NETINFO cell.  If it does want to authenticate, it MUST send a
CERTS cell, an AUTHENTICATE cell (4.4), and a NETINFO.  When this
-   handshake is in use, the first cell must be VERSIONS, VPADDING or
+   handshake is in use, the first cell must be VERSIONS, VPADDING, or
AUTHORIZE, and no other cell type is allowed to intervene besides
-   those specified, except for PADDING and VPADDING cells.
+   those specified, except for VPADDING cells.
 
The AUTHORIZE cell type is reserved for future use by scanning-resistance
designs.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] README.HACKING: explain how to test an rbm patch

2017-09-07 Thread boklm

commit 53379a752224091a56d157f570155457936d6564
Author: Nicolas Vigier 
Date:   Thu Sep 7 12:45:19 2017 +0200

README.HACKING: explain how to test an rbm patch
---
 README.HACKING | 17 +
 1 file changed, 17 insertions(+)

diff --git a/README.HACKING b/README.HACKING
index df87410..31b8352 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -259,3 +259,20 @@ is closed and the container containing the failed build is 
removed.
 The path to the container should be printed on the screen in case you
 want to backup its rootfs to be able to look at it later.
 
+
+Testing an rbm patch
+
+
+When you are working on a patch to rbm, you might want to try a Tor
+Browser build using your patched version of rbm. You could patch the
+rbm in the rbm/ directory, however your patch can be reverted if you
+use any of the makefile rules that does a 'git submodule update'.
+To avoid this you can clone the rbm git repository to a separate
+directory, where you will apply your patch. To do a build using your
+patched rbm, take the command from the makefile, but replace $(rbm)
+with the path to your patched rbm.
+
+For example, if you want to try a Linux x86_64 alpha build, you can run:
+  $ /path_to_rbm/rbm build release --target alpha --target \
+torbrowser-linux-x86_64
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-browser-build/master] Picking up new rbm commit

2017-09-07 Thread gk

commit 6690281b7eec547ee4c977ae9fc89728f63c5016
Author: Georg Koppen 
Date:   Thu Sep 7 10:30:57 2017 +

Picking up new rbm commit
---
 rbm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm b/rbm
index 0f5857b..296fba7 16
--- a/rbm
+++ b/rbm
@@ -1 +1 @@
-Subproject commit 0f5857bb0486187fcd35c553dec9ae6d3657a98c
+Subproject commit 296fba79fca70b922cc6eb2be8b830d8074b70e4

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [rbm/master] Bug 23382: create tmp_dir if it does not exist

2017-09-07 Thread gk

commit 296fba79fca70b922cc6eb2be8b830d8074b70e4
Author: Nicolas Vigier 
Date:   Wed Sep 6 16:54:07 2017 +0200

Bug 23382: create tmp_dir if it does not exist
---
 lib/RBM.pm   | 21 +
 lib/RBM/DefaultConfig.pm |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/RBM.pm b/lib/RBM.pm
index df29a01..b14909f 100644
--- a/lib/RBM.pm
+++ b/lib/RBM.pm
@@ -259,11 +259,17 @@ sub exit_error {
 exit (exists $_[1] ? $_[1] : 1);
 }
 
+sub get_tmp_dir {
+my ($project, $options) = @_;
+my $tmp_dir = project_config($project, 'tmp_dir', $options);
+make_path($tmp_dir);
+return $tmp_dir;
+}
+
 sub set_git_gpg_wrapper {
 my ($project) = @_;
 my $w = project_config($project, 'gpg_wrapper');
-my (undef, $tmp) = File::Temp::tempfile(DIR =>
-project_config($project, 'tmp_dir'));
+my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project));
 write_file($tmp, $w);
 chmod 0700, $tmp;
 system('git', 'config', 'gpg.program', $tmp) == 0
@@ -314,7 +320,7 @@ sub git_tag_sign_id {
 sub file_sign_id {
 my ($project, $options) = @_;
 my (undef, $gpg_wrapper) = File::Temp::tempfile(DIR =>
-project_config($project, 'tmp_dir', $options));
+get_tmp_dir($project, $options));
 write_file($gpg_wrapper, project_config($project, 'gpg_wrapper', 
$options));
 chmod 0700, $gpg_wrapper;
 my ($stdout, $stderr, $success, $exit_code) =
@@ -445,8 +451,7 @@ sub run_script {
 $f //= \_exec;
 my @res;
 if ($cmd =~ m/^#/) {
-my (undef, $tmp) = File::Temp::tempfile(DIR =>
-project_config($project, 'tmp_dir'));
+my (undef, $tmp) = File::Temp::tempfile(DIR => get_tmp_dir($project));
 write_file($tmp, $cmd);
 chmod 0700, $tmp;
 @res = $f->($tmp);
@@ -540,7 +545,7 @@ sub maketar {
 || exit_error 'Error running git archive.';
 if (project_config($project, 'git_submodule', $options)) {
 my $tmpdir = File::Temp->newdir(
-project_config($project, 'tmp_dir', $options) . '/rbm-X');
+get_tmp_dir($project, $options) . '/rbm-X');
 my ($stdout, $stderr, $success, $exit_code)
 = capture_exec('git', 'checkout', $commit_hash);
 exit_error "Cannot checkout $commit_hash: $stderr" unless $success;
@@ -952,7 +957,7 @@ sub build_run {
 my $old_cwd = getcwd;
 my $srcdir = project_config($project, 'build_srcdir', $options);
 my $use_srcdir = $srcdir;
-my $tmpdir = File::Temp->newdir(project_config($project, 'tmp_dir', 
$options)
+my $tmpdir = File::Temp->newdir(get_tmp_dir($project, $options)
 . '/rbm-X');
 my @cfiles;
 if ($use_srcdir) {
@@ -1119,7 +1124,7 @@ sub publish {
 project_config($project, 'publish', { error_if_undef => 1 });
 my $publish_src_dir = project_config($project, 'publish_src_dir');
 if (!$publish_src_dir) {
-$publish_src_dir = File::Temp->newdir(project_config($project, 
'tmp_dir')
+$publish_src_dir = File::Temp->newdir(get_tmp_dir($project)
 . '/rbm-XX');
 build_pkg($project, {output_dir => $publish_src_dir});
 }
diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm
index b1f97cb..d0d893a 100644
--- a/lib/RBM/DefaultConfig.pm
+++ b/lib/RBM/DefaultConfig.pm
@@ -106,7 +106,7 @@ sub rbm_tmp_dir {
 my ($project, $options) = @_;
 CORE::state $rbm_tmp_dir;
 return $rbm_tmp_dir->dirname if $rbm_tmp_dir;
-my $tmp_dir = RBM::project_config($project, 'tmp_dir', $options)
+my $tmp_dir = RBM::get_tmp_dir($project, $options)
   || RBM::exit_error('No tmp_dir specified');
 $rbm_tmp_dir = File::Temp->newdir(TEMPLATE => 'rbm-XX',
   DIR => $tmp_dir);

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Keep annotations of given descriptors.

2017-09-07 Thread karsten

commit 68f5301bd1cf8b10fcae0a2d7e924cc87093a97c
Author: iwakeh 
Date:   Fri Aug 18 13:03:05 2017 +

Keep annotations of given descriptors.

Makes test pass again and implements task-23215.
Changes a test descriptor to contain a second annotation.
---
 CHANGELOG.md   |  8 
 .../collector/persist/DescriptorPersistence.java   | 14 --
 src/test/resources/bridge-2016-10-02-08-09-00-extra-infos  |  8 
 src/test/resources/moria-1048576-2016-10-05.tpf|  2 +-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6a8bf6..ada02ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Changes in version 1.?.? - 2017-??-??
+
+ * Medium changes
+   - When synchronizing descriptors from another CollecTor instance,
+ keep annotations provided by the descriptor and only add the
+ default annotation, when there was none.
+
+
 # Changes in version 1.2.1 - 2017-08-17
 
  * Medium changes
diff --git 
a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java 
b/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java
index d54392d..e7bce5b 100644
--- a/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java
+++ b/src/main/java/org/torproject/collector/persist/DescriptorPersistence.java
@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.util.List;
 
 public abstract class DescriptorPersistence {
 
@@ -32,9 +33,18 @@ public abstract class DescriptorPersistence {
   protected String recentPath;
 
   /** Initializes the paths for storing descriptors of type T. */
-  protected DescriptorPersistence(T desc, byte[] annotation) {
+  protected DescriptorPersistence(T desc, byte[] defaultAnnotation) {
 this.desc = desc;
-this.annotation = annotation;
+List annotations = desc.getAnnotations();
+if (annotations.isEmpty()) {
+  this.annotation = defaultAnnotation;
+} else {
+  StringBuilder sb = new StringBuilder("");
+  for (String annotation : annotations) {
+sb.append(annotation).append("\n");
+  }
+  this.annotation = sb.toString().getBytes();
+}
   }
 
   /** Stores the descriptor to all locations.
diff --git a/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos 
b/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos
index f485178..7eea3f8 100644
--- a/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos
+++ b/src/test/resources/bridge-2016-10-02-08-09-00-extra-infos
@@ -1,4 +1,5 @@
 @type bridge-extra-info 1.3
+@some-future annotation
 extra-info DragonBridge A8D07F92DF78FA2C208FA6675B56E0A7BB750794
 master-key-ed25519 jBoYHwHIP9vplYgonlMUFJxND0QMEBqCnL2cEe2NbYc
 published 2016-10-02 06:09:10
@@ -144,6 +145,13 @@ bridge-ip-transports =8,obfs3=8,obfs4=48
 router-digest-sha256 b/PO7nPdxo+we9Tr/dQt2hAyu1TbtAWdjzac3CWYzpg
 router-digest BCFCBB38B15E9B500B1A6E9B0BCBBCE858660F17
 @type bridge-extra-info 1.3
+@many more annotations
+@one
+@two
+@three
+@four
+@five and
+@last and final
 extra-info Unnamed 1283EDA3E80CA2D485CCFEDB9715392396DFAD29
 master-key-ed25519 5GUbxrSHFtj6QjHHx5ovS2gAh8/ZjtbjU4yjULS0l0s
 published 2016-10-02 06:09:43
diff --git a/src/test/resources/moria-1048576-2016-10-05.tpf 
b/src/test/resources/moria-1048576-2016-10-05.tpf
index ea05a13..780fa33 100644
--- a/src/test/resources/moria-1048576-2016-10-05.tpf
+++ b/src/test/resources/moria-1048576-2016-10-05.tpf
@@ -4,7 +4,7 @@ BUILDTIMES=0.658563137054,1.08981704712,1.52948904037 
CIRC_ID=1166 CONNECT=14756
 BUILDTIMES=0.696699857712,0.833825826645,0.981504917145 CIRC_ID=1172 
CONNECT=1475627521.53 DATACOMPLETE=1475627523.30 DATAPERC10=1475627522.45 
DATAPERC20=1475627522.57 DATAPERC30=1475627522.68 DATAPERC40=1475627522.73 
DATAPERC50=1475627522.85 DATAPERC60=1475627522.93 DATAPERC70=1475627523.04 
DATAPERC80=1475627523.05 DATAPERC90=1475627523.21 DATAREQUEST=1475627521.87 
DATARESPONSE=1475627522.12 DIDTIMEOUT=0 FILESIZE=1048576 LAUNCH=1475626321.13 
NEGOTIATE=1475627521.53 
PATH=$B411027C926A9BFFCF7DA91E3CAF1856A321EFFD,$02928855BFAD787F8B363F21860D1E7D156E0655,$95DA61AEF23A6C851028C1AA88AD8593F659E60F
 QUANTILE=0.80 READBYTES=1048873 REQUEST=1475627521.53 
RESPONSE=1475627521.87 SOCKET=1475627521.53 SOURCE=moria START=1475627521.53 
TIMEOUT=1500 USED_AT=1475627523.30 USED_BY=2771 WRITEBYTES=74
 @type torperf 1.0
 BUILDTIMES=0.574013948441,0.694298028946,0.844352960587 CIRC_ID=1173 
CONNECT=1475629321.12 DATACOMPLETE=1475629323.34 DATAPERC10=1475629322.05 
DATAPERC20=1475629322.18 DATAPERC30=1475629322.26 DATAPERC40=1475629322.44 
DATAPERC50=1475629322.58 DATAPERC60=1475629322.76 DATAPERC70=1475629322.90 
DATAPERC80=1475629323.13 DATAPERC90=1475629323.24 DATAREQUEST=1475629321.47 
DATARESPONSE=1475629321.71 DIDTIMEOUT=0 FILESIZE=1048576 LAUNCH=1475628121.66

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2017-09-07 Thread translation

commit 6a20c62ac4b1bd2f8018c62213f5648d45d7b023
Author: Translation commit bot 
Date:   Thu Sep 7 10:15:39 2017 +

Update translations for https_everywhere_completed
---
 el/https-everywhere.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/el/https-everywhere.properties b/el/https-everywhere.properties
index 507fcbd0b..753ee1fbf 100644
--- a/el/https-everywhere.properties
+++ b/el/https-everywhere.properties
@@ -1,8 +1,8 @@
 https-everywhere.menu.globalEnable = ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï HTTPS 
Everywhere
-https-everywhere.menu.globalDisable = ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï 
HTTPS Everywhere
+https-everywhere.menu.globalDisable = ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï 
HTTPS Îverywhere
 https-everywhere.menu.enableDisable = ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· / 
ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ½ ÎºÎ±Î½ÏÎ½ÏÎ½ 
 https-everywhere.menu.noRules = (ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ ÎºÎ±Î½ÏÎ½ÎµÏ Î³Î¹Î± 
Î±ÏÏÎ® ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±)
 https-everywhere.menu.unknownRules = (ÎÎ±Î½ÏÎ½ÎµÏ Î³Î¹Î± Î±ÏÏÎ® ÏÎ· 
ÏÎµÎ»Î¯Î´Î±: ÎÎ³Î½ÏÏÏÎ¿Î¹)
-https-everywhere.toolbar.hint = Î¤Î¿ HTTPS Everywhere ÎµÎ¹Î½Î±Î¹ ÏÏÏÎ± 
ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎµÎ½Î¿. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ¿ Î±Î»Î»Î¬Î¾ÎµÏÎµ Î¼Îµ 
Î²Î¬ÏÎ· ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±Î½Î¬ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î±, ÎºÎ¬Î½Î¿Î½ÏÎ±Ï 
ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½. 
+https-everywhere.toolbar.hint = Î¤Î¿ HTTPS Everywhere ÎµÎ¯Î½Î±Î¹ ÏÏÏÎ± 
ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î¿. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ¿ Î±Î»Î»Î¬Î¾ÎµÏÎµ Î¼Îµ 
Î²Î¬ÏÎ· ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±Î½Î¬ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î±, ÎºÎ¬Î½Î¿Î½ÏÎ±Ï 
ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½. 
 https-everywhere.migration.notification0 = ÎÏÏÎ® Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· 
ÎµÏÎ±Î½Î±ÏÎÏÎµÎ¹ ÏÎ¹Ï ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎºÎ±Î½ÏÎ½ÏÎ½ ÏÎ¿Ï HTTPS 
Everywhere ÏÏÎ¹Ï ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½ÎµÏ ÏÎ¹Î¼ÎÏ, Î¼Îµ ÏÎºÎ¿ÏÏ 
Î½Î± ÎµÏÎ±ÏÎ¼Î¿ÏÏÎµÎ¯ Î¼Î¹Î± ÎºÏÎ¯ÏÎ¹Î¼Î· Î´Î¹ÏÏÎ¸ÏÏÎ·.
-https-everywhere.menu.ruleset-tests = ÎÎºÏÎÎ»ÎµÏÎ· HTTPS Î Î±Î½ÏÎ¿Ï 
ÎÎ¿ÎºÎ¹Î¼ÎÏ ÎÎ±Î½ÏÎ½ÏÎ½
+https-everywhere.menu.ruleset-tests = ÎÎºÏÎÎ»ÎµÏÎ· ÎÎ¿ÎºÎ¹Î¼ÏÎ½ 
ÎÎ±Î½ÏÎ½ÏÎ½ ÏÎ¿Ï HTTPS Everywhere 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2017-09-07 Thread translation

commit df902e1e626588f88c967eada3b20bcd3237ba81
Author: Translation commit bot 
Date:   Thu Sep 7 10:15:32 2017 +

Update translations for https_everywhere
---
 el/https-everywhere.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/el/https-everywhere.properties b/el/https-everywhere.properties
index 507fcbd0b..753ee1fbf 100644
--- a/el/https-everywhere.properties
+++ b/el/https-everywhere.properties
@@ -1,8 +1,8 @@
 https-everywhere.menu.globalEnable = ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï HTTPS 
Everywhere
-https-everywhere.menu.globalDisable = ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï 
HTTPS Everywhere
+https-everywhere.menu.globalDisable = ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ¿Ï 
HTTPS Îverywhere
 https-everywhere.menu.enableDisable = ÎÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· / 
ÎÏÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÏÎ½ ÎºÎ±Î½ÏÎ½ÏÎ½ 
 https-everywhere.menu.noRules = (ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ ÎºÎ±Î½ÏÎ½ÎµÏ Î³Î¹Î± 
Î±ÏÏÎ® ÏÎ·Î½ ÏÎµÎ»Î¯Î´Î±)
 https-everywhere.menu.unknownRules = (ÎÎ±Î½ÏÎ½ÎµÏ Î³Î¹Î± Î±ÏÏÎ® ÏÎ· 
ÏÎµÎ»Î¯Î´Î±: ÎÎ³Î½ÏÏÏÎ¿Î¹)
-https-everywhere.toolbar.hint = Î¤Î¿ HTTPS Everywhere ÎµÎ¹Î½Î±Î¹ ÏÏÏÎ± 
ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎµÎ½Î¿. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ¿ Î±Î»Î»Î¬Î¾ÎµÏÎµ Î¼Îµ 
Î²Î¬ÏÎ· ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±Î½Î¬ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î±, ÎºÎ¬Î½Î¿Î½ÏÎ±Ï 
ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½. 
+https-everywhere.toolbar.hint = Î¤Î¿ HTTPS Everywhere ÎµÎ¯Î½Î±Î¹ ÏÏÏÎ± 
ÎµÎ½ÎµÏÎ³Î¿ÏÎ¿Î¹Î·Î¼ÎÎ½Î¿. ÎÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ¿ Î±Î»Î»Î¬Î¾ÎµÏÎµ Î¼Îµ 
Î²Î¬ÏÎ· ÏÎ·Î½ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î± Î±Î½Î¬ ÏÎ¿ÏÎ¿Î¸ÎµÏÎ¯Î±, ÎºÎ¬Î½Î¿Î½ÏÎ±Ï 
ÎºÎ»Î¹Îº ÏÏÎ¿ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î¿ ÏÏÎ· Î³ÏÎ±Î¼Î¼Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎµÏÎ½. 
 https-everywhere.migration.notification0 = ÎÏÏÎ® Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· 
ÎµÏÎ±Î½Î±ÏÎÏÎµÎ¹ ÏÎ¹Ï ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎºÎ±Î½ÏÎ½ÏÎ½ ÏÎ¿Ï HTTPS 
Everywhere ÏÏÎ¹Ï ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½ÎµÏ ÏÎ¹Î¼ÎÏ, Î¼Îµ ÏÎºÎ¿ÏÏ 
Î½Î± ÎµÏÎ±ÏÎ¼Î¿ÏÏÎµÎ¯ Î¼Î¹Î± ÎºÏÎ¯ÏÎ¹Î¼Î· Î´Î¹ÏÏÎ¸ÏÏÎ·.
-https-everywhere.menu.ruleset-tests = ÎÎºÏÎÎ»ÎµÏÎ· HTTPS Î Î±Î½ÏÎ¿Ï 
ÎÎ¿ÎºÎ¹Î¼ÎÏ ÎÎ±Î½ÏÎ½ÏÎ½
+https-everywhere.menu.ruleset-tests = ÎÎºÏÎÎ»ÎµÏÎ· ÎÎ¿ÎºÎ¹Î¼ÏÎ½ 
ÎÎ±Î½ÏÎ½ÏÎ½ ÏÎ¿Ï HTTPS Everywhere 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [collector/master] Changed test data, wich makes some tests fail.

2017-09-07 Thread karsten

commit 1042a7683c913a0e30d998fa9f7900d97046ac40
Author: iwakeh 
Date:   Fri Aug 18 13:03:04 2017 +

Changed test data, wich makes some tests fail.

Part of task-23215.
---
 src/test/resources/2016-09-20-13-00-00-consensus| 2 +-
 ...03580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87 | 2 +-
 src/test/resources/2016-10-02-17-00-00-consensus-microdesc  | 2 +-
 .../resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/resources/2016-09-20-13-00-00-consensus 
b/src/test/resources/2016-09-20-13-00-00-consensus
index 6511263..a61a811 100644
--- a/src/test/resources/2016-09-20-13-00-00-consensus
+++ b/src/test/resources/2016-09-20-13-00-00-consensus
@@ -1,4 +1,4 @@
-@type network-status-consensus-3 1.0
+@type network-status-consensus-3 1.17
 network-status-version 3
 vote-status consensus
 consensus-method 20
diff --git 
a/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87
 
b/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87
index c65ff66..02ee2bc 100644
--- 
a/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87
+++ 
b/src/test/resources/2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B-60ADC6BEC262AE921A1037D54C8A3976367DBE87
@@ -1,4 +1,4 @@
-@type network-status-vote-3 1.0
+@type network-status-vote-3 1.17
 network-status-version 3
 vote-status vote
 consensus-methods 13 14 15 16 17 18 19 20 22
diff --git a/src/test/resources/2016-10-02-17-00-00-consensus-microdesc 
b/src/test/resources/2016-10-02-17-00-00-consensus-microdesc
index 705f01b..563708f 100644
--- a/src/test/resources/2016-10-02-17-00-00-consensus-microdesc
+++ b/src/test/resources/2016-10-02-17-00-00-consensus-microdesc
@@ -1,4 +1,4 @@
-@type network-status-microdesc-consensus-3 1.0
+@type network-status-microdesc-consensus-3 1.17
 network-status-version 3 microdesc
 vote-status consensus
 consensus-method 20
diff --git 
a/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1 
b/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1
index c85732b..6171b44 100644
--- 
a/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1
+++ 
b/src/test/resources/20160920-063816-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1
@@ -1,4 +1,4 @@
-@type bridge-network-status 1.2
+@type bridge-network-status 1.17
 published 2016-09-20 06:38:16
 flag-thresholds stable-uptime=1293451 stable-mtbf=1209559 fast-speed=55000 
guard-wfu=98.000% guard-tk=691200 guard-bw-inc-exits=336000 
guard-bw-exc-exits=337000 enough-mtbf=1 ignoring-advertised-bws=0
 fingerprint 1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 >

1 - 100 of 101 matches

Mail list logo