- tor-commits - lists.torproject.org

[flashproxy/master] Longer delay after starting facilitator.
by dcf＠torproject.org 02 May '12

02 May '12

commit 3a7b0fe02dd448926ed19507cc5cb6855203f92c Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 2 13:56:27 2012 -0700 Longer delay after starting facilitator. --- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 2dd5787..cd21f07 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -35,7 +35,7 @@ PIDS_TO_KILL+=($!) echo "Start facilitator." "$FLASHPROXY_DIR"/facilitator.py -d --relay tor1.bamsoftware.com:9901 >/dev/null & PIDS_TO_KILL+=($!) -visible_sleep 5 +visible_sleep 15 echo "Start connector." "$FLASHPROXY_DIR"/connector.py >/dev/null & diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index dccf152..fbe56a5 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -34,7 +34,7 @@ PIDS_TO_KILL+=($!) echo "Start facilitator." "$FLASHPROXY_DIR"/facilitator.py -d --relay tor1.bamsoftware.com:9901 >/dev/null & PIDS_TO_KILL+=($!) -visible_sleep 5 +visible_sleep 15 echo "Start connector." "$FLASHPROXY_DIR"/connector.py >/dev/null &

1 0

[flashproxy/master] Use connector.py --register.
by dcf＠torproject.org 02 May '12

02 May '12

commit 8f2ec50ab9074d43bfbf0a0d35051406d1b02d7e Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 2 13:56:44 2012 -0700 Use connector.py --register. --- experiments/switching/local-http-constant.sh | 3 +-- experiments/switching/remote-tor-alternating.sh | 3 +-- experiments/switching/remote-tor-constant.sh | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index f7a8aba..4eb51b2 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -45,9 +45,8 @@ PIDS_TO_KILL+=($!) visible_sleep 5 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py >/dev/null & +"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null & PIDS_TO_KILL+=($!) -echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 1 echo "Start browser." diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index cd21f07..4b0df87 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -38,9 +38,8 @@ PIDS_TO_KILL+=($!) visible_sleep 15 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py >/dev/null & +"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null & PIDS_TO_KILL+=($!) -echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 1 echo "Start Tor." diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index fbe56a5..7320999 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -37,9 +37,8 @@ PIDS_TO_KILL+=($!) visible_sleep 15 echo "Start connector." -"$FLASHPROXY_DIR"/connector.py >/dev/null & +"$FLASHPROXY_DIR"/connector.py --register --facilitator 127.0.0.1:9002 >/dev/null & PIDS_TO_KILL+=($!) -echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 1 echo "Start Tor."

1 0

[flashproxy/master] Use the WebSocket port on the relay in switching experiment.
by dcf＠torproject.org 02 May '12

02 May '12

commit 9f8ed10416d0b2cc3aa3a46d7b9b5ba4794f6285 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Apr 27 00:50:54 2012 -0700 Use the WebSocket port on the relay in switching experiment. --- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index 0ab4511..2dd5787 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -33,7 +33,7 @@ echo "Start web server." PIDS_TO_KILL+=($!) echo "Start facilitator." -"$FLASHPROXY_DIR"/facilitator.py -d --relay tor1.bamsoftware.com >/dev/null & +"$FLASHPROXY_DIR"/facilitator.py -d --relay tor1.bamsoftware.com:9901 >/dev/null & PIDS_TO_KILL+=($!) visible_sleep 5 diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index 0b16fec..dccf152 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -32,7 +32,7 @@ echo "Start web server." PIDS_TO_KILL+=($!) echo "Start facilitator." -"$FLASHPROXY_DIR"/facilitator.py -d --relay tor1.bamsoftware.com >/dev/null & +"$FLASHPROXY_DIR"/facilitator.py -d --relay tor1.bamsoftware.com:9901 >/dev/null & PIDS_TO_KILL+=($!) visible_sleep 5

1 0

[flashproxy/master] Fix socat line, accidentally broken in a9dce418.
by dcf＠torproject.org 02 May '12

02 May '12

commit 3c7c11e61793509deb090216feb370d979f50e40 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 2 13:55:53 2012 -0700 Fix socat line, accidentally broken in a9dce418. --- experiments/switching/local-http-alternating.sh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 0d3eb08..ee2dd70 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -54,9 +54,8 @@ PIDS_TO_KILL+=($!) visible_sleep 2 echo "Start socat." -"$FLASHPROXY_DIR"/connector.py >/dev/null & +"$SOCAT" TCP-LISTEN:2000,reuseaddr,fork SOCKS4A:127.0.0.1:dummy:0,socksport=9001 & PIDS_TO_KILL+=($!) -echo $'POST / HTTP/1.0\r\n\r\nclient=:9000' | socat - TCP-CONNECT:127.0.0.1:9002 visible_sleep 2

1 0

[arm/master] Parsing error with .desktop file
by atagar＠torproject.org 02 May '12

02 May '12

commit 9fd23e343861055b6d5b4893d5f161970aff2be4 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 2 07:05:11 2012 -0700 Parsing error with .desktop file Caught and fixed by miceliux on... https://trac.torproject.org/projects/tor/ticket/5735 --- src/resources/tor-arm.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/resources/tor-arm.desktop b/src/resources/tor-arm.desktop index bf922a5..da94017 100644 --- a/src/resources/tor-arm.desktop +++ b/src/resources/tor-arm.desktop @@ -9,4 +9,4 @@ Exec=arm -g Icon=tor-arm Terminal=false Type=Application -Categories=System;Monitor;GTK +Categories=System;Monitor;GTK;

1 0

[metrics-web/master] Make GetTor stats file parsing more robust.
by karsten＠torproject.org 02 May '12

02 May '12

commit bfd2c04cb8ec972e9e71036f6c679c3ac06d9c73 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 2 15:02:54 2012 +0200 Make GetTor stats file parsing more robust. --- src/org/torproject/ernie/cron/GetTorProcessor.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/ernie/cron/GetTorProcessor.java b/src/org/torproject/ernie/cron/GetTorProcessor.java index 0c5325d..2b5d67a 100644 --- a/src/org/torproject/ernie/cron/GetTorProcessor.java +++ b/src/org/torproject/ernie/cron/GetTorProcessor.java @@ -53,13 +53,22 @@ public class GetTorProcessor { continue; } Map<String, Integer> obs = new HashMap<String, Integer>(); - data.put(date, obs); for (int i = 2; i < parts.length; i++) { - String key = parts[i].split(":")[0].toLowerCase(); - Integer value = new Integer(parts[i].split(":")[1]); + String[] partParts = parts[i].split(":"); + if (partParts.length != 2) { + logger.warning("Illegal line in GetTor stats file: '" + line + + "'. Skipping."); + obs = null; + break; + } + String key = partParts[0].toLowerCase(); + Integer value = new Integer(partParts[1]); columns.add(key); obs.put(key, value); } + if (obs != null) { + data.put(date, obs); + } } br.close(); } catch (IOException e) {

1 0

r25636: {website} add latest press. (website/trunk/press/en)
by Andrew Lewman 01 May '12

01 May '12

Author: phobos Date: 2012-05-02 02:59:45 +0000 (Wed, 02 May 2012) New Revision: 25636 Modified: website/trunk/press/en/inthemedia.wml Log: add latest press. Modified: website/trunk/press/en/inthemedia.wml =================================================================== --- website/trunk/press/en/inthemedia.wml 2012-05-01 19:09:42 UTC (rev 25635) +++ website/trunk/press/en/inthemedia.wml 2012-05-02 02:59:45 UTC (rev 25636) @@ -32,6 +32,11 @@ <th>Topic</th> </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2012 Apr 30</td> +<td>Forbes</td> +<td><a href="http://www.forbes.com/sites/andygreenberg/2012/04/30/the-tor-projects-new-t…">The Tor Project's New Tool Aims To Map Out Internet Censorship</a></td> +</tr> <tr> <td>2012 Apr 20</td> <td>The Guardian</td>

1 0

[torbutton/master] Bug 5715: Explicitly clear image cache on New Identity
by mikeperry＠torproject.org 01 May '12

01 May '12

commit 3009ee8b19600737ee12b2891fe75486e30e8417 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue May 1 14:10:48 2012 -0700 Bug 5715: Explicitly clear image cache on New Identity It seems to get cleared eventually by nsICacheService.EvictEntries, but this gets it done immediately. --- src/chrome/content/torbutton.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 57261c9..dc0b05b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1481,6 +1481,10 @@ function torbutton_do_new_identity() { m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", tabs); + var imgCache = Components.classes["@mozilla.org/image/cache;1"]. + getService(Components.interfaces.imgICache); + imgCache.clearCache(false); // evict all but chrome cache + var cache = Components.classes["@mozilla.org/network/cache-service;1"]. getService(Components.interfaces.nsICacheService); try {

1 0

[torbutton/master] Bug #4660: Clear search and find boxes on New Identity.
by mikeperry＠torproject.org 01 May '12

01 May '12

commit 98b533c046e9bf5cafc91bfcf996c4ca7497bb26 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue May 1 16:47:28 2012 -0700 Bug #4660: Clear search and find boxes on New Identity. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index dc0b05b..876b6ef 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1432,6 +1432,16 @@ function torbutton_do_new_identity() { torbutton_close_on_toggle(true, true); + var searchBar = window.document.getElementById("searchbar"); + if (searchBar) + searchBar.textbox.reset(); + + if (gFindBarInitialized) { + var findbox = gFindBar.getElement("findbar-textbox"); + findbox.reset(); + gFindBar.close(); + } + if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { var auth = Components.classes["@mozilla.org/network/http-auth-manager;1"]. getService(Components.interfaces.nsIHttpAuthManager);

1 0

[torbutton/master] Bug 5729: Set startup window size to 200x100 multiple.
by mikeperry＠torproject.org 01 May '12

01 May '12

commit 926fb864e13558617cdafeceb99235b924d0faa0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue May 1 17:03:40 2012 -0700 Bug 5729: Set startup window size to 200x100 multiple. The old toggle code was getting invoked to preserve pref updates, re-rounding our 200x100 windows to 50px multiples.. --- src/chrome/content/torbutton.js | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 876b6ef..b52bf9f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -4050,6 +4050,7 @@ function torbutton_do_resize(ev) m_tb_window_width = window.outerWidth; } +// XXX: unused. Use torbutton_set_window_size instead function torbutton_check_round(browser) { if(torbutton_is_windowed(window) @@ -4096,7 +4097,7 @@ function torbutton_set_window_size(bWin) { +" inner: "+bWin.innerWidth+"x"+bWin.innerHeight+ " in state "+window.windowState+" Have "+availWidth.value+"x"+availHeight.value); - var maxHeight = availHeight.value - (window.outerHeight - bWin.innerHeight) - 101; + var maxHeight = availHeight.value - (window.outerHeight - bWin.innerHeight) - 1; var maxWidth = availWidth.value - (window.outerWidth - bWin.innerWidth); var width; @@ -4381,7 +4382,7 @@ function torbutton_update_tags(win, new_loc) { // NoScript torbutton_log(3, "Javascript changed from "+browser.docShell.allowJavascript+" to: "+js_enabled); browser.docShell.allowJavascript = js_enabled; - torbutton_check_round(browser); + torbutton_set_window_size(browser.contentWindow); // Tag this specially, so that the next onLocationChange // doesn't redo these hooks. @@ -4393,7 +4394,7 @@ function torbutton_update_tags(win, new_loc) { } else { // We need to do the resize here as well in case the window // was minimized during toggle... - torbutton_check_round(browser); + torbutton_set_window_size(browser.contentWindow); } }

1 0