April 2012 - tor-commits - lists.torproject.org

[flashproxy/js] Use ClientTransportPlugin in exercise.sh.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 9ceca5714484999b245c505e3816d149edc207dd Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 12:59:34 2012 -0700 Use ClientTransportPlugin in exercise.sh. --- experiments/exercise/exercise.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 0557062..04026e8 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -25,7 +25,7 @@ PIDS_TO_KILL+=($!) sleep 20 -"$TOR" UseBridges 1 Bridge 127.0.0.1:9001 Socks4Proxy 127.0.0.1:$LOCAL_PORT LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!) sleep 60

1 0

[flashproxy/js] Check that handler.path exists.
by dcf＠torproject.org 05 Apr '12

05 Apr '12

commit 4e9fdcf8b427c2005c0b2fb8a4200b7647d6b918 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Apr 2 14:08:57 2012 -0700 Check that handler.path exists. The connector was crashing when a connection was made to the remote port and then closed without sending any data. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index f7f35e3..a4e242a 100755 --- a/connector.py +++ b/connector.py @@ -391,7 +391,7 @@ def handle_websocket_request(fd): log(u"handle_websocket_request") request_text = fd.recv(10 * 1024) handler = WebSocketRequestHandler(request_text, fd) - if handler.error: + if handler.error or not hasattr(handler, "path"): return None method = handler.command path = handler.path

1 0

[tor/master] ides has become turtles, and gotten a new IP address
by nickm＠torproject.org 05 Apr '12

05 Apr '12

commit b24487d1068dc09c08a8bde8f84fab9307ba9a27 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 5 01:51:04 2012 +0200 ides has become turtles, and gotten a new IP address As per ticket 5569 --- changes/ides-becomes-turtles | 4 ++++ src/or/config.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/ides-becomes-turtles b/changes/ides-becomes-turtles new file mode 100644 index 0000000..09d964f --- /dev/null +++ b/changes/ides-becomes-turtles @@ -0,0 +1,4 @@ + o Directory authority changes: + - Change IP address for ides (v3 directory authority), and rename it to + turtles. + diff --git a/src/or/config.c b/src/or/config.c index fbbd902..681df57 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -809,8 +809,8 @@ add_default_trusted_dir_authorities(authority_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", - "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", + "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 " "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/master] Wrap long line; strlen("ides")<strlen("turtles").
by nickm＠torproject.org 05 Apr '12

05 Apr '12

commit 439fc704f14af50364bee5d3cd91a2bca0d8611a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 4 21:05:19 2012 -0400 Wrap long line; strlen("ides")<strlen("turtles"). --- src/or/config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 681df57..090aba1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -809,7 +809,8 @@ add_default_trusted_dir_authorities(authority_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 " + "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 "

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 05 Apr '12

05 Apr '12

commit 15ac8c5711fdbf5f1327368be20e62776ccda45f Merge: b8e5822 439fc70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 4 21:05:42 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/ides-becomes-turtles | 4 ++++ src/or/config.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.2] ides has become turtles, and gotten a new IP address
by nickm＠torproject.org 05 Apr '12

05 Apr '12

commit b24487d1068dc09c08a8bde8f84fab9307ba9a27 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Apr 5 01:51:04 2012 +0200 ides has become turtles, and gotten a new IP address As per ticket 5569 --- changes/ides-becomes-turtles | 4 ++++ src/or/config.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/ides-becomes-turtles b/changes/ides-becomes-turtles new file mode 100644 index 0000000..09d964f --- /dev/null +++ b/changes/ides-becomes-turtles @@ -0,0 +1,4 @@ + o Directory authority changes: + - Change IP address for ides (v3 directory authority), and rename it to + turtles. + diff --git a/src/or/config.c b/src/or/config.c index fbbd902..681df57 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -809,8 +809,8 @@ add_default_trusted_dir_authorities(authority_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", - "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", + "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 " "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",

1 0

[tor/maint-0.2.2] Wrap long line; strlen("ides")<strlen("turtles").
by nickm＠torproject.org 05 Apr '12

05 Apr '12

commit 439fc704f14af50364bee5d3cd91a2bca0d8611a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 4 21:05:19 2012 -0400 Wrap long line; strlen("ides")<strlen("turtles"). --- src/or/config.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 681df57..090aba1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -809,7 +809,8 @@ add_default_trusted_dir_authorities(authority_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 " + "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 "

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 04 Apr '12

04 Apr '12

commit 7caba4b27e9645e7da39379b16ecce8a643540cf Merge: edd91f5 aaed240 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 4 17:01:28 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 7 ++++--- build-scripts/osx.mk | 6 ++++-- build-scripts/windows.mk | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-)

1 0

[torbrowser/maint-2.2] add vietnamese to windows and osx bundles, add korean to all bundles, alphabetize the compressed bundles list (closes: #4898 and #5243)
by erinn＠torproject.org 04 Apr '12

04 Apr '12

commit aaed240f29961542130b014481e5694977e71da0 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 4 17:01:18 2012 -0300 add vietnamese to windows and osx bundles, add korean to all bundles, alphabetize the compressed bundles list (closes: #4898 and #5243) --- build-scripts/linux.mk | 7 ++++--- build-scripts/osx.mk | 6 ++++-- build-scripts/windows.mk | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 4235b1c..fed251a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -183,13 +183,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index deff00a..68e13fe 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -198,12 +198,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1fa3e0c..dc8de89 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -190,12 +190,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup

1 0

[torbrowser/maint-2.3] add vietnamese to windows and osx bundles, add korean to all bundles, alphabetize the compressed bundles list (closes: #4898 and #5243)
by erinn＠torproject.org 04 Apr '12

04 Apr '12

commit aaed240f29961542130b014481e5694977e71da0 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Apr 4 17:01:18 2012 -0300 add vietnamese to windows and osx bundles, add korean to all bundles, alphabetize the compressed bundles list (closes: #4898 and #5243) --- build-scripts/linux.mk | 7 ++++--- build-scripts/osx.mk | 6 ++++-- build-scripts/windows.mk | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 4235b1c..fed251a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -183,13 +183,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it \ - compressed-bundle_vi + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index deff00a..68e13fe 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -198,12 +198,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1fa3e0c..dc8de89 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -190,12 +190,14 @@ all-compressed-bundles: compressed-bundle_ar \ compressed-bundle_es-ES \ compressed-bundle_fa \ compressed-bundle_fr \ + compressed-bundle_it \ + compressed-bundle_ko \ compressed-bundle_nl \ compressed-bundle_pl \ compressed-bundle_pt-PT \ compressed-bundle_ru \ - compressed-bundle_zh-CN \ - compressed-bundle_it + compressed-bundle_vi \ + compressed-bundle_zh-CN ## ## Cleanup

1 0