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

[tor/maint-0.3.5] test/dir: add an extra argument to dirserv_read_measured_bandwidths()
by teor＠torproject.org 27 Mar '19

27 Mar '19

commit 091f8688b8ee15b57ed5bc24bac12a7a0b7f5725 Author: teor <teor(a)torproject.org> Date: Thu Mar 21 12:56:28 2019 +1000 test/dir: add an extra argument to dirserv_read_measured_bandwidths() Part of 29806. --- src/test/test_dir.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index cbb414ed6..0e44c47f3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2014,7 +2014,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); expect_log_msg_containing("Ignoring bandwidth file line"); teardown_capture_of_logs(); @@ -2032,7 +2032,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Read the bandwidth file */ setup_full_capture_of_logs(LOG_DEBUG); - tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); + tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL)); expect_log_msg_not_containing("Ignoring bandwidth file line"); teardown_capture_of_logs();

1 0

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

27 Mar '19

commit 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d Merge: 091f8688b 6d057c56f Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:02:40 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
by teor＠torproject.org 27 Mar '19

27 Mar '19

commit 6d057c56f170a7d72751b9557c78c2f6ee5735b9 Merge: d7a5fdcb7 4ab2e9a59 Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:01:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4 changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-)

1 0

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

27 Mar '19

commit ca29cb397b619252a3d07d6f371313f10d8fb23f Merge: 9ae8d663e 3280e9a11 Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:02:47 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0

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

27 Mar '19

commit 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d Merge: 091f8688b 6d057c56f Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:02:40 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

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

27 Mar '19

commit 6d057c56f170a7d72751b9557c78c2f6ee5735b9 Merge: d7a5fdcb7 4ab2e9a59 Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:01:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4 changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-)

1 0

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

27 Mar '19

commit 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d Merge: 091f8688b 6d057c56f Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:02:40 2019 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
by teor＠torproject.org 27 Mar '19

27 Mar '19

commit 6d057c56f170a7d72751b9557c78c2f6ee5735b9 Merge: d7a5fdcb7 4ab2e9a59 Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:01:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4 changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
by teor＠torproject.org 27 Mar '19

27 Mar '19

commit 6d057c56f170a7d72751b9557c78c2f6ee5735b9 Merge: d7a5fdcb7 4ab2e9a59 Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:01:45 2019 +1000 Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4 changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-)

1 0

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

27 Mar '19

commit ca29cb397b619252a3d07d6f371313f10d8fb23f Merge: 9ae8d663e 3280e9a11 Author: teor <teor(a)torproject.org> Date: Wed Mar 27 10:02:47 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0

1 0