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

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

13 Mar '19

commit 9daae1b302abb8c0e75773738cb4f55d88ff6b1d Merge: 2e74edb53 7a0ff5beb Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:35:05 2019 +1000 Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9 changes/bug27073 | 4 ++++ src/test/test_threads.c | 30 +++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.0] 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/maint-0.4.0] 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

[tor/maint-0.4.0] 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.4.0] 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

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

13 Mar '19

commit 5606cfae472a4e49d07bb14f4dfa336a8ded3930 Merge: 155b0f552 e91b999cf Author: teor <teor(a)torproject.org> Date: Thu Mar 14 06:41:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4 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 | 25 ++++++----- src/or/rephist.h | 10 +++-- src/or/scheduler_kist.c | 2 - src/test/test_relay.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- 10 files changed, 210 insertions(+), 22 deletions(-) diff --cc src/or/rephist.h index 3e64a3de4,37a91fd9b..9ef49d19c --- a/src/or/rephist.h +++ b/src/or/rephist.h @@@ -19,10 -19,10 +19,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/maint-0.4.0] 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/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