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

[globe/master] Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master
by isis＠torproject.org 13 Nov '14

13 Nov '14

commit b6133fa5389e985bf41a44bbabaae0366968a946 Merge: 77cb5a5 5472eba Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 23:05:53 2014 +0000 Merge commit '5472eba12f1f9c4349493917ab0a17053fd277d7' from Syrup-tan/master README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[globe/master] Updating README.md
by isis＠torproject.org 13 Nov '14

13 Nov '14

commit 5472eba12f1f9c4349493917ab0a17053fd277d7 Author: Syrup-tan <syrup+git(a)denpa.moe> Date: Tue Nov 11 18:32:19 2014 -0500 Updating README.md Updating jquery-deparam license. The original code, found at http://benalman.com/projects/jquery-bbq-plugin/ is licensed under MIT/GPL, so we can use MIT in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e2ec842..2d70217 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Project | License [jQuery](http://jquery.com/) | [MIT License](http://opensource.org/licenses/MIT) [qTip2](http://qtip2.com/) | [MIT License](http://opensource.org/licenses/MIT) [DataTables](https://datatables.net/) | [MIT license](http://opensource.org/licenses/MIT) [@](http://datatables.net/license_mit) -[jquery deparam](https://github.com/chrissrogers/jquery-deparam/blob/master/jquery-… | none mentioned +[jquery deparam](https://github.com/chrissrogers/jquery-deparam/blob/master/jquery-… | [MIT license](http://opensource.org/licenses/MIT) [@](http://benalman.com/about/license/) [jsSHA](http://caligatio.github.io/jsSHA/) | [BSD license](https://github.com/Caligatio/jsSHA/blob/release-1.42/LICENSE) ##Installation

1 0

[globe/master] Fixing Onionoo-API link
by isis＠torproject.org 13 Nov '14

13 Nov '14

commit b7ad9c01203f94ac7668c695bb7add663447e2df Author: Syrup-tan <syrup+git(a)denpa.moe> Date: Tue Nov 11 17:25:08 2014 -0500 Fixing Onionoo-API link https://trac.torproject.org/projects/tor/ticket/12933 --- src/html/index.raw.html | 2 +- src/js/templates/index.hbs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/html/index.raw.html b/src/html/index.raw.html index 9f064c9..9306db8 100644 --- a/src/html/index.raw.html +++ b/src/html/index.raw.html @@ -41,7 +41,7 @@ <h3>What is Globe</h3> <p>Globe is an application that helps you find and explore <a href="https://www.torproject.org/">Tor</a> relays and bridges. - It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://www.torproject.org/projects/onionoo.html">Onionoo-API</a> to get the data. + It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://onionoo.torproject.org/">Onionoo-API</a> to get the data. More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://github.com/makepanic/globe/blob/master/README.md">README</a>. </p> diff --git a/src/js/templates/index.hbs b/src/js/templates/index.hbs index abb74fe..e4b5912 100644 --- a/src/js/templates/index.hbs +++ b/src/js/templates/index.hbs @@ -8,7 +8,7 @@ <div class="text-content"> <h3>What is Globe</h3> <p>Globe is an application that helps you find and explore <a href="https://www.torproject.org/">Tor</a> relays and bridges. - It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://www.torproject.org/projects/onionoo.html">Onionoo-API</a> to get the data. + It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://onionoo.torproject.org/">Onionoo-API</a> to get the data. More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://github.com/makepanic/globe/blob/master/README.md">README</a>. </p> </div> @@ -28,4 +28,4 @@ </div> </div> </div> -</div> \ No newline at end of file +</div>

1 0

[globe/master] Fixing french flag
by isis＠torproject.org 13 Nov '14

13 Nov '14

commit 1aec5a27d878d242488cbf6d43a4c28592e297eb Author: Syrup-tan <syrup+git(a)denpa.moe> Date: Tue Nov 11 17:59:57 2014 -0500 Fixing french flag https://trac.torproject.org/projects/tor/ticket/13355 --- res/assets/img/country-flag-atlas.png | Bin 101396 -> 80634 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/assets/img/country-flag-atlas.png b/res/assets/img/country-flag-atlas.png index 0f701d4..99d228a 100644 Binary files a/res/assets/img/country-flag-atlas.png and b/res/assets/img/country-flag-atlas.png differ

1 0

[globe/master] Merge remote-tracking branch 'Syrup-tan/trac-12933'
by isis＠torproject.org 13 Nov '14

13 Nov '14

commit b03048a88210f4bccf1c16a301775e68523b34c1 Merge: 8411f2a b7ad9c0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 22:55:24 2014 +0000 Merge remote-tracking branch 'Syrup-tan/trac-12933' src/html/index.raw.html | 2 +- src/js/templates/index.hbs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[globe/master] Merge remote-tracking branch 'Syrup-tan/trac-13355'
by isis＠torproject.org 13 Nov '14

13 Nov '14

commit 77cb5a5b4e92555dc19e51a0ee682739f5fe2a3a Merge: b03048a 1aec5a2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Nov 12 22:59:24 2014 +0000 Merge remote-tracking branch 'Syrup-tan/trac-13355' res/assets/img/country-flag-atlas.png | Bin 101396 -> 80634 bytes 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[tor/master] Add longclaw as a directory authority (#13296)
by nickm＠torproject.org 12 Nov '14

12 Nov '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/master] Remove turtles as a directory authority (#13296)
by nickm＠torproject.org 12 Nov '14

12 Nov '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/master] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 12 Nov '14

12 Nov '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

[tor/master] Add changes file for #13926
by nickm＠torproject.org 12 Nov '14

12 Nov '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