July 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.7] Remove urras as a default trusted directory authority
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 7ae34e722aeccb199938d1c2faa243d23891a74c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jul 3 21:56:39 2016 +0200 Remove urras as a default trusted directory authority It had been a directory authority since 0.2.1.20. --- src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1610cad..709c5cc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -802,8 +802,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dannenberg orport=443 no-v2 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit f4408747d3e8de35f6beaf37535315b907c87656 Merge: 744077d 6e96aad Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:23:14 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 src/or/config.c | 5 ----- 1 file changed, 5 deletions(-) diff --cc src/or/config.c index 0850013,0f36738..908f098 --- a/src/or/config.c +++ b/src/or/config.c @@@ -919,14 -877,8 +919,9 @@@ static const char *default_authorities[ "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417" - /* XX/teor - urras may have an IPv6 address, but it's not in urras' - * descriptor as of 11 Dec 2015. See #17813. */, "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "

1 0

[tor/maint-0.2.8] Remove urras as a default trusted directory authority
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 7ae34e722aeccb199938d1c2faa243d23891a74c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jul 3 21:56:39 2016 +0200 Remove urras as a default trusted directory authority It had been a directory authority since 0.2.1.20. --- src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1610cad..709c5cc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -802,8 +802,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dannenberg orport=443 no-v2 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",

1 0

[tor/maint-0.2.7] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 6e96aadadbe9ac49582c770e9ff11b3c2876abf3 Merge: 80089c9 c28ba99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:22:47 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --cc src/or/config.c index 3b35b5a,89b6087..0f36738 --- a/src/or/config.c +++ b/src/or/config.c @@@ -857,41 -841,6 +857,38 @@@ escaped_safe_str(const char *address return escaped(address); } +/** List of default directory authorities */ + +static const char *default_authorities[] = { + "moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", + "tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", + "dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "Tonga orport=443 bridge " + "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", + "gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", + "maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + NULL +}; + /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with type. * Each authority's bits are restricted to the bits shared with type.

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1 Merge: f25f7b7 7ae34e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:20:42 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --cc src/or/config.c index 60d3d7f,709c5cc..3c7e6e4 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,21 +856,21 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " + "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL

1 0

[tor/master] Remove urras as a default trusted directory authority
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 7ae34e722aeccb199938d1c2faa243d23891a74c Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sun Jul 3 21:56:39 2016 +0200 Remove urras as a default trusted directory authority It had been a directory authority since 0.2.1.20. --- src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 1610cad..709c5cc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -802,8 +802,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dannenberg orport=443 no-v2 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit c28ba994ec95f4f669ad5131f36b0f9f1cc53782 Merge: b4bb886 9d3de77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:21:25 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 src/or/config.c | 3 --- 1 file changed, 3 deletions(-)

1 0

[tor/maint-0.2.6] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit c28ba994ec95f4f669ad5131f36b0f9f1cc53782 Merge: b4bb886 9d3de77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:21:25 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 src/or/config.c | 3 --- 1 file changed, 3 deletions(-)

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 6e96aadadbe9ac49582c770e9ff11b3c2876abf3 Merge: 80089c9 c28ba99 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:22:47 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --cc src/or/config.c index 3b35b5a,89b6087..0f36738 --- a/src/or/config.c +++ b/src/or/config.c @@@ -857,41 -841,6 +857,38 @@@ escaped_safe_str(const char *address return escaped(address); } +/** List of default directory authorities */ + +static const char *default_authorities[] = { + "moria1 orport=9101 " + "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " + "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", + "tor26 orport=443 " + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " + "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", + "dizum orport=443 " + "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " + "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", + "Tonga orport=443 bridge " + "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", + "gabelmoo orport=443 " + "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "dannenberg orport=443 " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", + "maatuska orport=80 " + "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + NULL +}; + /** Add the default directory authorities directly into the trusted dir list, * but only add them insofar as they share bits with type. * Each authority's bits are restricted to the bits shared with type.

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 9d3de77d4d76bbec8dfe8c53b0586171ab4b8ec1 Merge: f25f7b7 7ae34e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 12:20:42 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 src/or/config.c | 2 -- 1 file changed, 2 deletions(-) diff --cc src/or/config.c index 60d3d7f,709c5cc..3c7e6e4 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,23 -794,21 +856,21 @@@ add_default_trusted_dir_authorities(dir "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " + "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL

1 0