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

[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 02 May '12

02 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 02 May '12

02 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 02 May '12

02 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 02 May '12

02 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

[obfsproxy/master] Do the release ritual for 0.1.4.
by asn＠torproject.org 02 May '12

02 May '12

commit 94ebc4c3edf1e3e5f313444e59981ac557578df5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 1 22:38:18 2012 +0300 Do the release ritual for 0.1.4. --- ChangeLog | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd77adb..977a073 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.1.4 - <not yet released> +Changes in version 0.1.4 - 2012-05-02 - Fix 'obfsproxy --version' when called outside of a git repository. Fixes bug 5560. - Don't use hardening flags if they'd break the compiler. This happens diff --git a/configure.ac b/configure.ac index 90c4f9f..facd3c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.61])dnl Possibly earlier will do, but this is what I have -AC_INIT([obfsproxy], [0.1.3]) +AC_INIT([obfsproxy], [0.1.4]) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign nostdinc])

1 0

[obfsproxy/master] Don't use compiler flags that break the build
by asn＠torproject.org 02 May '12

02 May '12

commit 0feee69e1b2498ebe77f8780191ab1026eafcdec Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Apr 25 16:15:25 2012 +0200 Don't use compiler flags that break the build --- ChangeLog | 3 +++ m4/ax_build_hardening.m4 | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b99ee9..fd77adb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ Changes in version 0.1.4 - <not yet released> - Fix 'obfsproxy --version' when called outside of a git repository. Fixes bug 5560. + - Don't use hardening flags if they'd break the compiler. This happens + on Windows, for example, where -fPIE causes an error. Fixes bug + 5665. - Fix assertion failure when connecting to a SOCKS destination. Fixes bug #5586. - Fix crash when parsing obfs2 command line arguments. Fixes bug diff --git a/m4/ax_build_hardening.m4 b/m4/ax_build_hardening.m4 index 590a00d..ad06fcc 100644 --- a/m4/ax_build_hardening.m4 +++ b/m4/ax_build_hardening.m4 @@ -46,18 +46,19 @@ AC_DEFUN_ONCE([AX_ENABLE_HARDENING], [ ### Compiler Hardening ### # This requires ax_check_compile_flag.m4 -AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2], [CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"]) -AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [CFLAGS="$CFLAGS -fstack-protector-all"]) -AX_CHECK_COMPILE_FLAG([-fwrapv], [CFLAGS="$CFLAGS -fwrapv"]) -AX_CHECK_COMPILE_FLAG([-fPIE], [CFLAGS="$CFLAGS -fPIE"]) -AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1], [CFLAGS="$CFLAGS --param ssp-buffer-size=1"]) -AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"]) -AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CFLAGS="$CFLAGS -fno-strict-overflow"]) +AX_CHECK_COMPILE_FLAG([-D_FORTIFY_SOURCE=2], [CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"], [], [-Werror]) +AX_CHECK_COMPILE_FLAG([-fstack-protector-all], [CFLAGS="$CFLAGS -fstack-protector-all"], [], [-Werror]) +AX_CHECK_COMPILE_FLAG([-fwrapv], [CFLAGS="$CFLAGS -fwrapv"], [], [-Werror]) +AX_CHECK_COMPILE_FLAG([-fPIE], [CFLAGS="$CFLAGS -fPIE"], [], [-Werror]) +AX_CHECK_COMPILE_FLAG([--param ssp-buffer-size=1], [CFLAGS="$CFLAGS --param ssp-buffer-size=1"], [], [-Werror]) +AX_CHECK_COMPILE_FLAG([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"], [], [-Werror]) +AX_CHECK_COMPILE_FLAG([-fno-strict-overflow], [CFLAGS="$CFLAGS -fno-strict-overflow"], [], [-Werror]) ### Linker Hardening ### # This requires ax_check_link_flag.m4 -AX_CHECK_LINK_FLAG([-pie], [LDFLAGS="$LDFLAGS -pie"]) -AX_CHECK_LINK_FLAG([-z relro], [LDFLAGS="$LDFLAGS -z relro"]) -AX_CHECK_LINK_FLAG([-z now], [LDFLAGS="$LDFLAGS -z now"]) +AX_CHECK_LINK_FLAG([-pie], [LDFLAGS="$LDFLAGS -pie"], [], [-Werror]) +AX_CHECK_LINK_FLAG([-Wl,-pie], [LDFLAGS="$LDFLAGS -Wl,-pie"], [], [-Werror]) +AX_CHECK_LINK_FLAG([-z relro], [LDFLAGS="$LDFLAGS -z relro"], [], [-Werror]) +AX_CHECK_LINK_FLAG([-z now], [LDFLAGS="$LDFLAGS -z now"], [], [-Werror]) ])

1 0

[obfsproxy/master] Merge remote-tracking branch 'seb/bug5665'
by asn＠torproject.org 02 May '12

02 May '12

commit 70c522aaa6fa4fdbc335d4c7422924249a278bab Merge: eaf42ad 0feee69 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed May 2 04:38:21 2012 +0300 Merge remote-tracking branch 'seb/bug5665' ChangeLog | 3 +++ m4/ax_build_hardening.m4 | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-)

1 0

[obfsproxy/master] Revert "Produce an error if pkg-config isn't found."
by asn＠torproject.org 02 May '12

02 May '12

commit eaf42ad6177767e1cfcacbe87c3d2b4089bc79ca Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 1 20:54:52 2012 +0300 Revert "Produce an error if pkg-config isn't found." This reverts commit 5830a400052cfbb397d67aa2149a564af9f2df26. --- m4/pkg.m4 | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/m4/pkg.m4 b/m4/pkg.m4 index c9d0dd0..31169b4 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -43,8 +43,6 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi -else - AC_MSG_ERROR([pkg-config not found!]) fi[]dnl ])# PKG_PROG_PKG_CONFIG

1 0

[obfsproxy/master] Revert "Produce an error if pkg-config's version is old."
by asn＠torproject.org 02 May '12

02 May '12

commit 9e9573bdf6c4220d3c0180143ed00594cd7e8bf4 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue May 1 20:46:19 2012 +0300 Revert "Produce an error if pkg-config's version is old." This reverts commit e0e53de4f5ea91762fd810f2c5755f0c22e578ef, since it seems that adding pkg-config as a hard dependency is a bad idea (it's quite hard to install correctly in Windows). (ticket #5718) --- m4/pkg.m4 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/pkg.m4 b/m4/pkg.m4 index cb5292d..c9d0dd0 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -41,10 +41,10 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) - AC_MSG_ERROR([pkg-config must be at least version $_pkg_min_version.]) + PKG_CONFIG="" fi else - AC_MSG_ERROR([pkg-config not found!]) + AC_MSG_ERROR([pkg-config not found!]) fi[]dnl ])# PKG_PROG_PKG_CONFIG

1 0