December 2014 - tor-commits - lists.torproject.org

[tor/release-0.2.5] Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 137982f955b297b41a89086d672baf761825c152 Merge: 8d5f1e6 5441c73 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 24 09:18:36 2014 -0500 Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4 changes/geoip6-november2014 | 3 + src/config/geoip6 | 5649 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 5509 insertions(+), 143 deletions(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 8d5f1e6961feb1ef2a80d6d5a36e755a4b79007b Merge: dca902c 8611c6b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 24 09:18:21 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-november2014 | 3 + src/config/geoip |20036 ++++++++++++++++++++++++++++++-------------- 2 files changed, 13644 insertions(+), 6395 deletions(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 5b55778c86b88329725521d2c93829a9c9ad3501 Merge: 0872d8e 137982f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 24 09:19:06 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-november2014 | 3 + changes/geoip6-november2014 | 3 + src/config/geoip |20036 +++++++++++++++++++++++++++++-------------- src/config/geoip6 | 5649 +++++++++++- 4 files changed, 19153 insertions(+), 6538 deletions(-)

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 4b54ad017d3fadf3598dd4d5047188107718d92f Merge: 1d02f64 5b55778 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 22 10:27:08 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 changes/bug13296 | 5 + changes/geoip-november2014 | 3 + changes/geoip6-november2014 | 3 + src/config/geoip |20036 +++++++++++++++++++++++++++++-------------- src/config/geoip6 | 5649 +++++++++++- src/or/config.c | 6 +- 6 files changed, 19161 insertions(+), 6541 deletions(-)

1 0

[tor/release-0.2.5] Add longclaw as a directory authority (#13296)
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit ad448c6405b02e72bc5145b82705733c53861a19 Author: Micah Anderson <micah(a)riseup.net> Date: Sun Nov 9 15:48:56 2014 -0500 Add longclaw as a directory authority (#13296) --- src/or/config.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/config.c b/src/or/config.c index 919dd27..126b1c5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -813,6 +813,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "Faravahar orport=443 no-v2 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 no-v2 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0

[tor/release-0.2.5] Remove turtles as a directory authority (#13296)
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit b6e7b8c88cb50a122992a963ef0882ca9b963609 Author: Micah Anderson <micah(a)riseup.net> Date: Sun Nov 9 15:49:11 2014 -0500 Remove turtles as a directory authority (#13296) --- src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 126b1c5..9e05087 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -796,9 +796,6 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "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", - "turtles orport=9090 no-v2 " - "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "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/release-0.2.5] Add changes file for #13926
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 0493db4adb88b830b4339d320b96a88fc27a01bb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Nov 12 19:12:18 2014 +0100 Add changes file for #13926 --- changes/bug13296 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug13296 b/changes/bug13296 new file mode 100644 index 0000000..d6fe038 --- /dev/null +++ b/changes/bug13296 @@ -0,0 +1,5 @@ + o Directory authority changes: + - Remove turtles as a directory authority. + - Add longclaw as a new (v3) directory authority. This implements + ticket 13296. This keeps the directory authority count at 9. +

1 0

[tor/release-0.2.5] Update longclaw dirauth IP to be a more stable location
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit dca902ceba4d2440520d357ccc2e00b8aa59eb8b Author: Micah Anderson <micah(a)riseup.net> Date: Wed Nov 19 17:22:25 2014 -0500 Update longclaw dirauth IP to be a more stable location --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 9e05087..6a0d3da 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -812,7 +812,7 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", "longclaw orport=443 no-v2 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 0872d8e3cf3281fc5831375252db9e39de12e927 Merge: 6c146f9 dca902c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 19 17:26:42 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc src/or/config.c index 89ea586,6a0d3da..8921082 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,25 -794,25 +856,25 @@@ 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=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "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.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " + "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", + "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0

[tor/release-0.2.5] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 22 Dec '14

22 Dec '14

commit 6c146f9c83e24dc3ae74f56f93d4e7caf570e98b Merge: 9e2608b 0493db4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 12 15:29:39 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 Conflicts: src/or/config.c changes/bug13296 | 5 +++++ src/or/config.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --cc src/or/config.c index 39b85aa,9e05087..89ea586 --- a/src/or/config.c +++ b/src/or/config.c @@@ -856,25 -794,25 +856,25 @@@ 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", - "turtles orport=9090 " - "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", - "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=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "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.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", - "longclaw orport=443 no-v2 " ++ "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) {

1 0