October 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit eac4c374e456af4f216392ec2d3b037d5f57e2f3 Merge: c93ecb818 fcd5c3144 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 6a7aa4735724cdf8d37e4109705338a1ea947449 Merge: 009141c6a 85115796b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 85115796bb9095db2b59624b16c005f2252d4d71 Merge: 23e3d57e1 eac4c374e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.2] Adjust test, now that there are 9 dirauths again
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 90ea4da87..b48d5e8d2 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg) /* Assume we have eight V3 authorities */ add_default_trusted_dir_authorities(V3_DIRINFO); - tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8); - tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9); + tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9); + tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10); done: clear_dir_servers();

1 0

[tor/release-0.3.0] Adjust test, now that there are 9 dirauths again
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 90ea4da87..b48d5e8d2 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg) /* Assume we have eight V3 authorities */ add_default_trusted_dir_authorities(V3_DIRINFO); - tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8); - tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9); + tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9); + tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10); done: clear_dir_servers();

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Adjust test, now that there are 9 dirauths again
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index 90ea4da87..b48d5e8d2 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1632,8 +1632,8 @@ test_config_adding_default_trusted_dir_servers(void *arg) /* Assume we have eight V3 authorities */ add_default_trusted_dir_authorities(V3_DIRINFO); - tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 8); - tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 9); + tt_int_op(get_n_authorities(V3_DIRINFO), OP_EQ, 9); + tt_int_op(smartlist_len(router_get_fallback_dir_servers()), OP_EQ, 10); done: clear_dir_servers();

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5f78775a8a1d1155fc14231c5a416ab23d3a02ab Merge: 11abdccc7 85115796b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0