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

[tor/release-0.3.5] 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/release-0.3.5] 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/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 75edf0348e74fa07336460249ef43bac034659a6 Merge: 7c70d5a1b 5d41e2223 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 07:00:38 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5

1 0

[tor/maint-0.3.5] 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.3.5] Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit c03b1b3f08b0588c9ba36b2097d372cb62cfdc22 Merge: 5606cfae4 2840580cf Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:55:57 2019 +1000 Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4 changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.3.5] 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/maint-0.4.0] 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/maint-0.3.5] 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.3.5] Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034
by teor＠torproject.org 13 Mar '19

13 Mar '19

commit 2840580cf2753ac900b84f604989f9156708cdb3 Merge: 155b0f552 7a0ff5beb Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:47:32 2019 +1000 Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034 Replace == with OP_EQ in test macros. changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --cc src/test/test_threads.c index ed6d8f04a,448ab2034..4f37a40cc --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@@ -275,14 -283,15 +283,15 @@@ test_threads_conditionvar(void *arg SPIN(); tor_mutex_release(ti->mutex); - tt_int_op(ti->value, ==, 1337); + tt_int_op(ti->value, OP_EQ, 1337); if (!timeout) { - tt_int_op(ti->n_shutdown, ==, 4); + tt_int_op(ti->n_shutdown, OP_EQ, 4); } else { - tor_sleep_msec(200); - tor_mutex_acquire(ti->mutex); + const int GIVE_UP_AFTER_SEC = 30; + SPIN_UNTIL((ti->n_timeouts == 2 || + time(NULL) >= started_at + GIVE_UP_AFTER_SEC), 10); - tt_int_op(ti->n_shutdown, ==, 2); - tt_int_op(ti->n_timeouts, ==, 2); + tt_int_op(ti->n_shutdown, OP_EQ, 2); + tt_int_op(ti->n_timeouts, OP_EQ, 2); tor_mutex_release(ti->mutex); }

1 0

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

13 Mar '19

commit 66f944f79b9ae0d7383f9bf55c8d8cd4bdacf216 Merge: 155b0f552 2fbc58cf0 Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:53:17 2019 +1000 Merge branch 'bug28096-029-squashed' into bug28096-034-squashed Merge the new code, and preserve the #else macro comment from 0.3.4. changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-) diff --cc src/common/compat.c index 6fdd6ecf0,975875112..f8c4bdb4d --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -2755,13 -2761,26 +2775,26 @@@ get_uname,(void) "Unrecognized version of Windows [major=%d,minor=%d]", (int)info.dwMajorVersion,(int)info.dwMinorVersion); } - #ifdef VER_NT_SERVER - if (info.wProductType == VER_NT_SERVER || - info.wProductType == VER_NT_DOMAIN_CONTROLLER) { - strlcat(uname_result, " [server]", sizeof(uname_result)); - } - #endif /* defined(VER_NT_SERVER) */ + /* Now append extra information to the name. + * + * Microsoft's API documentation says that on Windows 8.1 and later, + * GetVersionEx returns Windows 8 (6.2) for applications without an + * app compatibility manifest (including tor's default build). + * + * But in our testing, we have seen the actual Windows version on + * Windows Server 2012 R2, even without a manifest. */ + if (info.dwMajorVersion > 6 || + (info.dwMajorVersion == 6 && info.dwMinorVersion >= 2)) { + /* When GetVersionEx() returns Windows 8, the actual OS may be any + * later version. */ + strlcat(uname_result, " [or later]", sizeof(uname_result)); + } + /* When we don't know if the OS is a client or server version, we use + * the client version, and this qualifier. */ + if (!is_server && !is_client) { + strlcat(uname_result, " [client or server]", sizeof(uname_result)); + } -#else +#else /* !(defined(_WIN32)) */ /* LCOV_EXCL_START -- can't provoke uname failure */ strlcpy(uname_result, "Unknown platform", sizeof(uname_result)); /* LCOV_EXCL_STOP */

1 0