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

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 343a694344ce93bc2b4f681b40708391fa80b957 Merge: 8fda6b2 dff390d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:23:04 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug21108_029 | 6 ++++++ src/or/dirserv.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Backport the tonga->bifroest move to 0.2.4.
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit e4a42242eaa2547adf0ad66ccc577f31817b86db Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:15:21 2017 -0500 Backport the tonga->bifroest move to 0.2.4. This is a backport of 19728 and 19690 --- changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bifroest b/changes/bifroest new file mode 100644 index 0000000..41af658 --- /dev/null +++ b/changes/bifroest @@ -0,0 +1,3 @@ + o Directory authority changes (also in 0.2.8.7): + - The "Tonga" bridge authority has been retired; the new bridge + authority is "Bifroest". Closes tickets 19728 and 19690. diff --git a/src/or/config.c b/src/or/config.c index 709c5cc..eae7296 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -794,8 +794,8 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "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 " - "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", + "Bifroest orport=443 bridge no-v2 " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 0a43134009a431ecd734a4c122d5de0d63529800 Merge: 115cefd c6f2ae5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:20:13 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 This is an "ours" merge to avoid conflicts on the authority list: the 0.2.7 branch already has the tonga->bifroest merge.

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27 Merge: 93ea18e 0a43134 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:20:45 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit b60fb3ab8b803b535a81296dbbf7d0c218a3dd27 Merge: 93ea18e 0a43134 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:20:45 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit c6f2ae514eb2713d386bedac2f7e71ed04385026 Merge: e6965f7 b9ef21c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:18:54 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/or/config.c index 89b6087,c60dd11..233940e --- a/src/or/config.c +++ b/src/or/config.c @@@ -853,14 -852,12 +853,14 @@@ add_default_trusted_dir_authorities(dir "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 " + "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 " + "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", + "Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit c6f2ae514eb2713d386bedac2f7e71ed04385026 Merge: e6965f7 b9ef21c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:18:54 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/or/config.c index 89b6087,c60dd11..233940e --- a/src/or/config.c +++ b/src/or/config.c @@@ -853,14 -852,12 +853,14 @@@ add_default_trusted_dir_authorities(dir "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 " + "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 " + "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", + "Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit b9ef21cf565cab46571f965fc2d3f368c7e7a1da Merge: 6b37512 e4a4224 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:17:59 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bifroest | 3 +++ src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/or/config.c index 3c7e6e4,eae7296..c60dd11 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,21 -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 82.94.251.203:80 " - "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "Bifroest orport=443 bridge no-v2 " ++ "Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", - "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", - "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/maint-0.2.9] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 0a43134009a431ecd734a4c122d5de0d63529800 Merge: 115cefd c6f2ae5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:20:13 2017 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 This is an "ours" merge to avoid conflicts on the authority list: the 0.2.7 branch already has the tonga->bifroest merge.

1 0

[tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 3e5b1c2d95d2270d2e7b9e137c5ec04e0e534659 Merge: 946661d b60fb3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:20:52 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9

1 0