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

[tor/master] Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit e91b999cf2dfbb250cbf6c674ea01d7cee518092 Merge: ad10cafd9 72e30f26e Author: teor <teor(a)torproject.org> Date: Fri Mar 8 19:37:18 2019 +1000 Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes src/or/rephist.c | 5 ++--- src/test/test_relay.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit f3b17a6b261e1feef05dafac247b96b3ea90a521 Merge: c03b1b3f0 66f944f79 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:56:09 2019 +1000 Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4 changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit feb7253df316ee1ec9c2ec3e33aac312da4d1f02 Merge: ec2a2a6b7 5d41e2223 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 07:00:43 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.4
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit e021f89f3636d197058dddea4383632bdf466ff0 Merge: f3b17a6b2 8bd9b2a6a Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:56:38 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.4 changes/bug25733 | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor/maint-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 5d41e2223f64517300aad168b2f2479ba00ac10b Merge: ffd720702 e021f89f3 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:59:09 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to ignore the changes to src/common/compat.c, they have already been merged to 0.3.5 in the correct file.

1 0

[tor/master] Bug 25733: Avoid assert failure if all circuits time out.
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit e8d84b18aabf6a3d32a41700142048224e83ed8b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 16 22:49:27 2018 +0000 Bug 25733: Avoid assert failure if all circuits time out. Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert. --- changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/changes/bug25733 b/changes/bug25733 new file mode 100644 index 000000000..775c1ae00 --- /dev/null +++ b/changes/bug25733 @@ -0,0 +1,4 @@ + o Minor bugfixes (Assert crash): + - Avoid an assert in the circuit build timeout code if we fail to + allow any circuits to actually complete. Fixes bug 25733; + bugfix on 0.2.2.2-alpha. diff --git a/src/or/circuitstats.c b/src/or/circuitstats.c index 418acc002..735b3f0fc 100644 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@ -753,11 +753,23 @@ circuit_build_times_get_xm(circuit_build_times_t *cbt) histogram[nth_max_bin[n]]); } - /* The following assert is safe, because we don't get called when we - * haven't observed at least CBT_MIN_MIN_CIRCUITS_TO_OBSERVE circuits. */ + /* bin_counts can become zero if all of our last CBT_NCIRCUITS_TO_OBSERVE + * circuits were abandoned before they completed. This shouldn't happen, + * though. We should have reset/re-learned a lower timeout first. */ + if (bin_counts == 0) { + ret = 0; + log_warn(LD_CIRC, + "No valid circuit build time data out of %d times, %u modes, " + "have_timeout=%d, %lfms", cbt->total_build_times, num_modes, + cbt->have_computed_timeout, cbt->timeout_ms); + goto done; + } + tor_assert(bin_counts > 0); ret /= bin_counts; + + done: tor_free(histogram); tor_free(nth_max_bin); @@ -1043,6 +1055,10 @@ circuit_build_times_update_alpha(circuit_build_times_t *cbt) * and less frechet-like. */ cbt->Xm = circuit_build_times_get_xm(cbt); + /* If Xm came back 0, then too many circuits were abandoned. */ + if (cbt->Xm == 0) + return 0; + tor_assert(cbt->Xm > 0); for (i=0; i< CBT_NCIRCUITS_TO_OBSERVE; i++) {

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 8bd9b2a6a0c7ab01ef72dd26e04544b00f8c9fa8 Merge: 90301247f 72e30f26e Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:37:50 2019 +1000 Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9 changes/bug23512 | 6 +++ src/or/channeltls.h | 2 + src/or/circuitlist.c | 59 ++++++++++++++++++++++++++ src/or/circuitlist.h | 2 + src/or/or.h | 12 ++++++ src/or/relay.c | 1 + src/or/rephist.c | 26 +++++++----- src/or/rephist.h | 10 +++-- src/test/test_relay.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++--- 9 files changed, 210 insertions(+), 21 deletions(-) diff --cc src/or/rephist.h index 6d35ac67f,837bb8d04..c464b34f7 --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -26,10 -26,10 +26,10 @@@ void rep_hist_note_bytes_written(uint64 void rep_hist_make_router_pessimal(const char *id, time_t when); - void rep_hist_note_dir_bytes_read(size_t num_bytes, time_t when); - void rep_hist_note_dir_bytes_written(size_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_read(uint64_t num_bytes, time_t when); + void rep_hist_note_dir_bytes_written(uint64_t num_bytes, time_t when); -int rep_hist_bandwidth_assess(void); +MOCK_DECL(int, rep_hist_bandwidth_assess, (void)); char *rep_hist_get_bandwidth_lines(void); void rep_hist_update_state(or_state_t *state); int rep_hist_load_state(or_state_t *state, char **err);

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 90301247fd35225cc25b6ea2568364356ff00580 Merge: 530304dd7 981bb6057 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:37:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9 changes/bug23681 | 5 +++++ src/or/circuituse.c | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 530304dd773b178c7cc0c5db26e53ec196219191 Merge: eaa84234c e8d84b18a Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:36:47 2019 +1000 Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9 changes/bug25733 | 4 ++++ src/or/circuitstats.c | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit eaa84234c97e54d2626239152a35bcd633c10107 Merge: 9daae1b30 2fbc58cf0 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:36:11 2019 +1000 Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9 changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-)

1 0