March 2016 - tor-commits - lists.torproject.org

[tor/master] Faravahar also versions.
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit e1f4d9552e6d6e42b028d8d405b6d182e81ce326 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 29 07:55:02 2016 -0400 Faravahar also versions. --- doc/HACKING/ReleasingTor.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 95b9bcd..85f3ba8 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -6,8 +6,8 @@ Here are the steps Roger takes when putting out a new Tor release: === 0. Preliminaries -1. Get at least two of weasel/arma/Sebastian to put the new version number - in their approved versions list. +1. Get at least two of weasel/arma/Sebastian/Sina to put the new + version number in their approved versions list. === I. Make sure it works

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 29 Mar '16

29 Mar '16

commit 4405aa4561d3b5d7fab2b28e01faaea321891bf5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 29 10:15:37 2016 +0000 Update translations for tor-launcher-properties_completed --- tr/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties index cbf467d..576ce65 100644 --- a/tr/torlauncher.properties +++ b/tr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Başlatıcı @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı. -torlauncher.torrc_missing=torrc dosyası bulunamadı. -torlauncher.datadir_missing=Tor veri klasörü bulunamadı. +torlauncher.torrc_missing="Torcc" dosyası eksik ve oluşturulamadı. +torlauncher.datadir_missing=Tor veri klasörü bulunamadı ve oluşturulamadı. torlauncher.password_hash_missing=Karılmış parola alınamadı. torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 29 Mar '16

29 Mar '16

commit 4b276fe52482389c79399c08c19ebd4198cdeecd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 29 10:15:32 2016 +0000 Update translations for tor-launcher-properties --- tr/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties index 9753476..576ce65 100644 --- a/tr/torlauncher.properties +++ b/tr/torlauncher.properties @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı. -torlauncher.torrc_missing="Torcc" dosyası bulunamadı ve yeniden yazılması başarısız oldu. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing="Torcc" dosyası eksik ve oluşturulamadı. +torlauncher.datadir_missing=Tor veri klasörü bulunamadı ve oluşturulamadı. torlauncher.password_hash_missing=Karılmış parola alınamadı. torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S

1 0

[metrics-web/master] Add snowflake to list of transports.
by karsten＠torproject.org 29 Mar '16

29 Mar '16

commit 6532c27d64e77433783478202a3c292e5aec719a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Mar 29 10:55:55 2016 +0200 Add snowflake to list of transports. --- website/src/org/torproject/metrics/web/GraphServlet.java | 1 + .../src/org/torproject/metrics/web/graphs/GraphParameterChecker.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/org/torproject/metrics/web/GraphServlet.java b/website/src/org/torproject/metrics/web/GraphServlet.java index 72f7f72..05139ed 100644 --- a/website/src/org/torproject/metrics/web/GraphServlet.java +++ b/website/src/org/torproject/metrics/web/GraphServlet.java @@ -98,6 +98,7 @@ public class GraphServlet extends MetricServlet { { "fte", "", "FTE" }, { "meek", "", "meek" }, { "scramblesuit", "", "scramblesuit" }, + { "snowflake", "", "snowflake" }, { "<??>", "", "Unknown pluggable transport(s)" }, { "<OR>", "", "Default OR protocol" } }); this.defaultParameters.put("version", new String[][] { diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java index 58fd064..5067789 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java @@ -66,7 +66,7 @@ public class GraphParameterChecker { this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); this.knownParameterValues.put("transport", "obfs2,obfs3,obfs4," - + "websocket,fte,meek,scramblesuit,<OR>,<??>,!<OR>"); + + "websocket,fte,meek,scramblesuit,snowflake,<OR>,<??>,!<OR>"); this.knownParameterValues.put("version", "v4,v6"); this.knownParameterValues.put("p", "100,99,98,97,95,91,90,80,75,70," + "60,50,40,30,25,20,10,9,5,3,2,1,0");

1 0

[tor/master] Fix my dumb unreleased bug in 18673
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit ba87f5bb25cd001ab8560f23a88e60a504c7059a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 20:09:09 2016 -0400 Fix my dumb unreleased bug in 18673 --- src/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 670c5b3..1efb7ef 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -760,7 +760,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan) void circuit_clear_testing_cell_stats(circuit_t *circ) { - if (!circ) + if (!circ || !circ->testing_cell_stats) return; SMARTLIST_FOREACH(circ->testing_cell_stats, testing_cell_stats_entry_t *, ent, tor_free(ent));

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit 90c24c0ced62a36c3100e49ad404b3519ba1cd77 Merge: 055a7a1 ba87f5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 20:09:22 2016 -0400 Merge branch 'maint-0.2.8' src/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.2.8] Fix my dumb unreleased bug in 18673
by nickm＠torproject.org 29 Mar '16

29 Mar '16

commit ba87f5bb25cd001ab8560f23a88e60a504c7059a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 28 20:09:09 2016 -0400 Fix my dumb unreleased bug in 18673 --- src/or/circuitlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 670c5b3..1efb7ef 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -760,7 +760,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan) void circuit_clear_testing_cell_stats(circuit_t *circ) { - if (!circ) + if (!circ || !circ->testing_cell_stats) return; SMARTLIST_FOREACH(circ->testing_cell_stats, testing_cell_stats_entry_t *, ent, tor_free(ent));

1 0

[stem/master] Fix unit tests
by atagar＠torproject.org 29 Mar '16

29 Mar '16

commit 745fe08199a2ba7d6fe3577f5bc6df54f9ae7ff9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 28 14:49:48 2016 -0700 Fix unit tests Oops, missed that this point could have non-string rules... ====================================================================== ERROR: test_all_default_policy ---------------------------------------------------------------------- Traceback (most recent call last): File "/srv/jenkins-workspace/workspace/stem-tor-ci/test/unit/exit_policy/policy.py", line 141, in test_all_default_policy for rule in policy: File "/srv/jenkins-workspace/workspace/stem-tor-ci/stem/exit_policy.py", line 502, in __iter__ for rule in self._get_rules(): File "/srv/jenkins-workspace/workspace/stem-tor-ci/stem/exit_policy.py", line 452, in _get_rules if not rule.strip(): AttributeError: 'ExitPolicyRule' object has no attribute 'strip' --- stem/cached_tor_manual.cfg | 6 +++--- stem/exit_policy.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index fade04b..8753a92 100644 --- a/stem/cached_tor_manual.cfg +++ b/stem/cached_tor_manual.cfg @@ -5,9 +5,9 @@ description | |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. | -|By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. -man_commit 94cb8792e8c28e75bc71434fc557ddefa5c03083 -stem_commit 27a654e2e0495c7ac701d792e7db7ed47d4e9753 +|By default, tor will act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. +man_commit 7d6e7fdd0343c32a09c926e7094d43f6653baa4f +stem_commit 7bfc752b69972f7043b260651602b8cb7bc270c4 commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line. commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint. diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 3d4e66a..0453470 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -449,13 +449,13 @@ class ExitPolicy(object): decompressed_rules = self._input_rules for rule in decompressed_rules: - if not rule.strip(): - continue - if isinstance(rule, bytes): rule = stem.util.str_tools._to_unicode(rule) if isinstance(rule, str_type): + if not rule.strip(): + continue + rule = ExitPolicyRule(rule.strip()) if rule.is_accept:

1 0

[stem/master] Ignore empty strings in exit policy constructor
by atagar＠torproject.org 29 Mar '16

29 Mar '16

commit 0fc6178bf07f058bd788ffdacabe1c7897e1b01f Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 28 14:38:14 2016 -0700 Ignore empty strings in exit policy constructor Making the constructor behave a bit more intuitively to avoid the confusion in... https://trac.torproject.org/projects/tor/ticket/18666 --- stem/exit_policy.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 003107e..3d4e66a 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -449,6 +449,9 @@ class ExitPolicy(object): decompressed_rules = self._input_rules for rule in decompressed_rules: + if not rule.strip(): + continue + if isinstance(rule, bytes): rule = stem.util.str_tools._to_unicode(rule)

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 29 Mar '16

29 Mar '16

commit 3f03819f46600444abd240299d7f00e99327b707 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 28 21:15:58 2016 +0000 Update translations for torbutton-torbuttonproperties --- sv/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/torbutton.properties b/sv/torbutton.properties index 1777959..a7188c9 100644 --- a/sv/torbutton.properties +++ b/sv/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=%S Profilproblem profileReadOnly=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till ett annat ställe innan användning. profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-katalogen innan användning. profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen ändra dina rättigheter i filsystemet och försök igen! -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas.

1 0