September 2013 - tor-commits - lists.torproject.org

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit c0760f6f3105241d9d9fe4d044a9538eb1e8883d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 01:15:30 2013 +0000 Update translations for vidalia_completed --- sr/vidalia_sr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index dd4157b..0d98813 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-05 01:00+0000\n" "Last-Translator: milos123\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 05 Sep '13

05 Sep '13

commit 8c77c2701ba89a03c4ee1c098d74e934097dc7e3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 5 01:15:24 2013 +0000 Update translations for vidalia --- sr/vidalia_sr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sr/vidalia_sr.po b/sr/vidalia_sr.po index dd4157b..0d98813 100644 --- a/sr/vidalia_sr.po +++ b/sr/vidalia_sr.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2013-08-20 08:30+0000\n" +"PO-Revision-Date: 2013-09-05 01:00+0000\n" "Last-Translator: milos123\n" "Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] use !cbt_disabled in place of LearnCBT to avoid needless circs
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit 4f3dbb3c0a5c1a6d7d8571add3722e6c567e3d81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 15:51:13 2013 -0400 use !cbt_disabled in place of LearnCBT to avoid needless circs This would make us do testing circuits "even when cbt is disabled by consensus, or when we're a directory authority, or when we've failed to write cbt history to our state file lately." (Roger's words.) This is a fix for 9671 and an improvement in our fix for 5049. The original misbehavior was in 0.2.2.14-alpha; the incomplete fix was in 0.2.3.17-beta. --- changes/bug9671_023 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/circuitbuild.h | 1 + src/or/circuituse.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug9671_023 b/changes/bug9671_023 new file mode 100644 index 0000000..035ca5c --- /dev/null +++ b/changes/bug9671_023 @@ -0,0 +1,5 @@ + o Major bugfixes: + - If the circuit build timeout logic is disabled (via the consensus, + or because we are an authority), then don't build testing circuits. + Fixes bug 9657; bugfix on 0.2.2.14-alpha. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f8521c5..1c692ab 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -147,7 +147,7 @@ static void pathbias_count_success(origin_circuit_t *circ); * 3. If we are a directory authority * 4. If we fail to write circuit build time history to our state file. */ -static int +int circuit_build_times_disabled(void) { if (unit_tests) { diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 984d04a..fc6ca65 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -32,6 +32,7 @@ char *circuit_list_path_for_controller(origin_circuit_t *circ); void circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ); void circuit_rep_hist_note_result(origin_circuit_t *circ); +int circuit_build_times_disabled(void); origin_circuit_t *origin_circuit_init(uint8_t purpose, int flags); origin_circuit_t *circuit_establish_circuit(uint8_t purpose, extend_info_t *exit, diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 20f124e..ade4224 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -746,7 +746,7 @@ circuit_predict_and_launch_new(void) * want, don't do another -- we want to leave a few slots open so * we can still build circuits preemptively as needed. */ if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && - get_options()->LearnCircuitBuildTimeout && + ! circuit_build_times_disabled() && circuit_build_times_needs_circuits_now(&circ_times)) { flags = CIRCLAUNCH_NEED_CAPACITY; log_info(LD_CIRC, @@ -882,7 +882,7 @@ circuit_expire_old_circuits_clientside(void) tor_gettimeofday(&now); cutoff = now; - if (get_options()->LearnCircuitBuildTimeout && + if (! circuit_build_times_disabled() && circuit_build_times_needs_circuits(&circ_times)) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit a60d21a85deacad98fa04d20fb4e83b57ad191d7 Merge: a8e76de 3cebc5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 16:08:02 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/circuitbuild.c changes/bug9671_023 | 5 +++++ src/or/circuituse.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug9671_023' into maint-0.2.3
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit 3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa Merge: 8611195 4f3dbb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 16:04:47 2013 -0400 Merge branch 'bug9671_023' into maint-0.2.3 changes/bug9671_023 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/circuitbuild.h | 1 + src/or/circuituse.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit d5e9573ed24df7c0eb795617de9db2a0c3e40b4d Merge: 386e9fb a60d21a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 16:11:20 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: src/or/circuituse.c changes/bug9671_023 | 5 +++++ src/or/circuituse.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --cc src/or/circuituse.c index e3c0d0c,25997eb..00dbc7e --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -943,8 -948,8 +943,8 @@@ circuit_predict_and_launch_new(void * want, don't do another -- we want to leave a few slots open so * we can still build circuits preemptively as needed. */ if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && - get_options()->LearnCircuitBuildTimeout && + ! circuit_build_times_disabled() && - circuit_build_times_needs_circuits_now(&circ_times)) { + circuit_build_times_needs_circuits_now(get_circuit_build_times())) { flags = CIRCLAUNCH_NEED_CAPACITY; log_info(LD_CIRC, "Have %d clean circs need another buildtime test circ.", num); @@@ -1079,8 -1084,8 +1079,8 @@@ circuit_expire_old_circuits_clientside( tor_gettimeofday(&now); cutoff = now; - if (get_options()->LearnCircuitBuildTimeout && + if (! circuit_build_times_disabled() && - circuit_build_times_needs_circuits(&circ_times)) { + circuit_build_times_needs_circuits(get_circuit_build_times())) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING;

1 0

[tor/maint-0.2.4] use !cbt_disabled in place of LearnCBT to avoid needless circs
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit 4f3dbb3c0a5c1a6d7d8571add3722e6c567e3d81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 15:51:13 2013 -0400 use !cbt_disabled in place of LearnCBT to avoid needless circs This would make us do testing circuits "even when cbt is disabled by consensus, or when we're a directory authority, or when we've failed to write cbt history to our state file lately." (Roger's words.) This is a fix for 9671 and an improvement in our fix for 5049. The original misbehavior was in 0.2.2.14-alpha; the incomplete fix was in 0.2.3.17-beta. --- changes/bug9671_023 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/circuitbuild.h | 1 + src/or/circuituse.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug9671_023 b/changes/bug9671_023 new file mode 100644 index 0000000..035ca5c --- /dev/null +++ b/changes/bug9671_023 @@ -0,0 +1,5 @@ + o Major bugfixes: + - If the circuit build timeout logic is disabled (via the consensus, + or because we are an authority), then don't build testing circuits. + Fixes bug 9657; bugfix on 0.2.2.14-alpha. + diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f8521c5..1c692ab 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -147,7 +147,7 @@ static void pathbias_count_success(origin_circuit_t *circ); * 3. If we are a directory authority * 4. If we fail to write circuit build time history to our state file. */ -static int +int circuit_build_times_disabled(void) { if (unit_tests) { diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 984d04a..fc6ca65 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -32,6 +32,7 @@ char *circuit_list_path_for_controller(origin_circuit_t *circ); void circuit_log_path(int severity, unsigned int domain, origin_circuit_t *circ); void circuit_rep_hist_note_result(origin_circuit_t *circ); +int circuit_build_times_disabled(void); origin_circuit_t *origin_circuit_init(uint8_t purpose, int flags); origin_circuit_t *circuit_establish_circuit(uint8_t purpose, extend_info_t *exit, diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 20f124e..ade4224 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -746,7 +746,7 @@ circuit_predict_and_launch_new(void) * want, don't do another -- we want to leave a few slots open so * we can still build circuits preemptively as needed. */ if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && - get_options()->LearnCircuitBuildTimeout && + ! circuit_build_times_disabled() && circuit_build_times_needs_circuits_now(&circ_times)) { flags = CIRCLAUNCH_NEED_CAPACITY; log_info(LD_CIRC, @@ -882,7 +882,7 @@ circuit_expire_old_circuits_clientside(void) tor_gettimeofday(&now); cutoff = now; - if (get_options()->LearnCircuitBuildTimeout && + if (! circuit_build_times_disabled() && circuit_build_times_needs_circuits(&circ_times)) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */

1 0

[tor/maint-0.2.4] Merge branch 'bug9671_023' into maint-0.2.3
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit 3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa Merge: 8611195 4f3dbb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 16:04:47 2013 -0400 Merge branch 'bug9671_023' into maint-0.2.3 changes/bug9671_023 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/circuitbuild.h | 1 + src/or/circuituse.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit a60d21a85deacad98fa04d20fb4e83b57ad191d7 Merge: a8e76de 3cebc5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 16:08:02 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/circuitbuild.c changes/bug9671_023 | 5 +++++ src/or/circuituse.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.3] Merge branch 'bug9671_023' into maint-0.2.3
by nickm＠torproject.org 04 Sep '13

04 Sep '13

commit 3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa Merge: 8611195 4f3dbb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 4 16:04:47 2013 -0400 Merge branch 'bug9671_023' into maint-0.2.3 changes/bug9671_023 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/circuitbuild.h | 1 + src/or/circuituse.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0