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

[tor/master] 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/maint-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/maint-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.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

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

1 0

[tor/release-0.2.9] 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/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 Merge: b8dedaee7 23e3d57e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

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

23 Oct '17

commit 2d4983dcd7e574cdf0c663e262ff83f7a99fb7ef Merge: 15a7e24dc 8cc147aa8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

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

23 Oct '17

commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

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

23 Oct '17

commit 5e1bad325965c4f91433dfbe46f4d3c268327d4e Merge: 533ae56fc 15a699462 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 09:03:58 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

1 0

[tor/release-0.2.8] dirauth: Add bastet to the default authorities
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket23910 b/changes/ticket23910 new file mode 100644 index 000000000..eb38fcf32 --- /dev/null +++ b/changes/ticket23910 @@ -0,0 +1,3 @@ + o Directory authority changes: + - Add bastet as a ninth directory authority to the default list. Closes + ticket 23910. diff --git a/src/or/config.c b/src/or/config.c index 97dffe505..bd168bef1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -873,6 +873,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + "bastet orport=443 " + "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 " + "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413", NULL }; for (i=0; authorities[i]; i++) {

1 0