- tor-commits - lists.torproject.org

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

11 Oct '11

commit bc2d9357f523d87385229087cb13253874f070f0 Merge: b5edc83 9648f03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 10 22:50:52 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4212 | 13 +++++++++++++ src/or/rendclient.c | 18 ++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-)

1 0

[tor/master] Don't launch a useless circuit in rend_client_reextend_intro_circuit
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit 274b25de1258647d00509b4a8e378a2115da066c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Oct 9 20:24:27 2011 -0700 Don't launch a useless circuit in rend_client_reextend_intro_circuit Fixes bug 4212. Bug reported by katmagic and found by Sebastian. --- changes/bug4212 | 13 +++++++++++++ src/or/rendclient.c | 14 ++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/changes/bug4212 b/changes/bug4212 new file mode 100644 index 0000000..6222a59 --- /dev/null +++ b/changes/bug4212 @@ -0,0 +1,13 @@ + o Major bugfixes: + + - Don't launch a useless circuit after failing to use one of a + hidden service's introduction points. Previously, we would + launch a new introduction circuit, but not set the hidden + service which that circuit was intended to connect to, so it + would never actually be used. A different piece of code would + then create a new introduction circuit correctly, so this bug + was harmless until it caused an assertion in the client-side + part of the #3825 fix to fail. Bug reported by katmagic and + found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug + 4212. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 533dfb8..9c247f5 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -106,17 +106,11 @@ rend_client_reextend_intro_circuit(origin_circuit_t *circ) result = circuit_extend_to_new_exit(circ, extend_info); } else { log_info(LD_REND, - "Building a new introduction circuit, this time to %s.", - safe_str_client(extend_info_describe(extend_info))); + "Closing intro circ %d (out of RELAY_EARLY cells).", + circ->_base.n_circ_id); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); - if (!circuit_launch_by_extend_info(CIRCUIT_PURPOSE_C_INTRODUCING, - extend_info, - CIRCLAUNCH_IS_INTERNAL)) { - log_warn(LD_REND, "Building introduction circuit failed."); - result = -1; - } else { - result = 0; - } + /* connection_ap_handshake_attach_circuit will launch a new intro circ. */ + result = 0; } extend_info_free(extend_info); return result;

1 0

[tor/maint-0.2.2] Don't launch a useless circuit in rend_client_reextend_intro_circuit
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit 274b25de1258647d00509b4a8e378a2115da066c Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Oct 9 20:24:27 2011 -0700 Don't launch a useless circuit in rend_client_reextend_intro_circuit Fixes bug 4212. Bug reported by katmagic and found by Sebastian. --- changes/bug4212 | 13 +++++++++++++ src/or/rendclient.c | 14 ++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/changes/bug4212 b/changes/bug4212 new file mode 100644 index 0000000..6222a59 --- /dev/null +++ b/changes/bug4212 @@ -0,0 +1,13 @@ + o Major bugfixes: + + - Don't launch a useless circuit after failing to use one of a + hidden service's introduction points. Previously, we would + launch a new introduction circuit, but not set the hidden + service which that circuit was intended to connect to, so it + would never actually be used. A different piece of code would + then create a new introduction circuit correctly, so this bug + was harmless until it caused an assertion in the client-side + part of the #3825 fix to fail. Bug reported by katmagic and + found by Sebastian Hahn. Bugfix on 0.2.1.13-alpha; fixes bug + 4212. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 533dfb8..9c247f5 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -106,17 +106,11 @@ rend_client_reextend_intro_circuit(origin_circuit_t *circ) result = circuit_extend_to_new_exit(circ, extend_info); } else { log_info(LD_REND, - "Building a new introduction circuit, this time to %s.", - safe_str_client(extend_info_describe(extend_info))); + "Closing intro circ %d (out of RELAY_EARLY cells).", + circ->_base.n_circ_id); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_FINISHED); - if (!circuit_launch_by_extend_info(CIRCUIT_PURPOSE_C_INTRODUCING, - extend_info, - CIRCLAUNCH_IS_INTERNAL)) { - log_warn(LD_REND, "Building introduction circuit failed."); - result = -1; - } else { - result = 0; - } + /* connection_ap_handshake_attach_circuit will launch a new intro circ. */ + result = 0; } extend_info_free(extend_info); return result;

1 0

[tor/maint-0.2.2] Update documentation comment for rend_client_reextend_intro_circuit
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit 9648f034c07603a7430b08386172e7a9c0759847 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Oct 10 05:33:53 2011 -0700 Update documentation comment for rend_client_reextend_intro_circuit One of its callers assumes a non-zero result indicates a permanent failure (i.e. the current attempt to connect to this HS either has failed or is doomed). The other caller only requires that this function's result never equal -2. Bug reported by Sebastian Hahn. --- src/or/rendclient.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 9c247f5..f84475a 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -80,8 +80,8 @@ rend_client_send_establish_rendezvous(origin_circuit_t *circ) /** Extend the introduction circuit <b>circ</b> to another valid * introduction point for the hidden service it is trying to connect * to, or mark it and launch a new circuit if we can't extend it. - * Return 0 on success. Return -1 and mark the introduction - * circuit on failure. + * Return 0 on success or possible success. Return -1 and mark the + * introduction circuit for close on permanent failure. * * On failure, the caller is responsible for marking the associated * rendezvous circuit for close. */

1 0

[tor/master] Fix a compile warning on OS X 10.6 and up
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit cce85c819b4a9c20562f7860cbe2a8020123ebff Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 11 02:25:00 2011 +0200 Fix a compile warning on OS X 10.6 and up --- src/common/util.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 9df7a50..79e09e4 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3894,7 +3894,9 @@ get_string_from_pipe(FILE *stream, char *buf_out, size_t count) char *retval; size_t len; - retval = fgets(buf_out, count, stream); + tor_assert(count <= INT_MAX); + + retval = fgets(buf_out, (int)count, stream); if (!retval) { if (feof(stream)) {

1 0

[tor/master] Merge remote-tracking branch 'sebastian/osxcompile'
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit b5edc838f283c50e8de378e3037a999736d9bbf4 Merge: b4bd836 cce85c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 10 22:03:20 2011 -0400 Merge remote-tracking branch 'sebastian/osxcompile' src/common/util.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)

1 0

[tor/master] Consider hibernation before dropping privs
by nickm＠torproject.org 11 Oct '11

11 Oct '11

commit b4bd836f46549b6263c8c55eb3bc127884b72340 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Oct 11 02:40:06 2011 +0200 Consider hibernation before dropping privs Without this patch, Tor wasn't sure whether it would be hibernating or not, so it postponed opening listeners until after the privs had been dropped. This doesn't work so well for low ports. Bug was introduced in the fix for bug 2003. Fixes bug 4217, reported by Zax and katmagic. Thanks! --- src/or/config.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2705ba5..1304c46 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1080,6 +1080,9 @@ options_act_reversible(const or_options_t *old_options, char **msg) if (parse_client_ports(options, 0, msg, &n_client_ports)) return -1; + /* Set the hibernation state appropriately.*/ + consider_hibernation(time(NULL)); + /* Launch the listeners. (We do this before we setuid, so we can bind to * ports under 1024.) We don't want to rebind if we're hibernating. */ if (!we_are_hibernating()) {

1 0

[torbrowser/maint-2.2] Fix for 4192.
by erinn＠torproject.org 10 Oct '11

10 Oct '11

commit dd8d5dcb03ffaf2d15747608178a9d3b2888f559 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Oct 9 22:55:00 2011 -0700 Fix for 4192. It ain't pretty. It just exits if we don't have a TBB profile. --- ...owser-exit-when-not-launched-from-Vidalia.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch b/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch new file mode 100644 index 0000000..6659770 --- /dev/null +++ b/src/current-patches/0009-Make-Tor-Browser-exit-when-not-launched-from-Vidalia.patch @@ -0,0 +1,46 @@ +From 369d7df54fe13dd69a069a43959bdabcc364e6e4 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Sun, 9 Oct 2011 22:50:07 -0700 +Subject: [PATCH] Make Tor Browser exit when not launched from Vidalia + +Turns out the Windows 7 UI encourages users to "dock" their Tor Browser app +for easy relaunch. If they manage to do this, we should fail closed rather +than opened. Hopefully they will get the hint and dock Vidalia instead. + +This is an emergency fix for +https://trac.torproject.org/projects/tor/ticket/4192. We can do a better +localized fix w/ a translated alert menu later, if it seems like this might +actually be common. +--- + browser/base/content/browser.js | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js +index 50f6963..ed2812c 100644 +--- a/browser/base/content/browser.js ++++ b/browser/base/content/browser.js +@@ -1203,6 +1203,21 @@ function BrowserStartup() { + + prepareForStartup(); + ++ // If this is not a TBB profile, exit. ++ // Solves https://trac.torproject.org/projects/tor/ticket/4192 ++ var foundPref = false; ++ try { ++ foundPref = gPrefService.prefHasUserValue("torbrowser.version"); ++ } catch(e) { ++ //dump("No pref: "+e); ++ } ++ if(!foundPref) { ++ var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"] ++ .getService(Components.interfaces.nsIAppStartup); ++ appStartup.quit(3); // Force all windows to close, and then quit. ++ } ++ ++ + if (uriToLoad && !isLoadingBlank) { + if (uriToLoad instanceof Ci.nsISupportsArray) { + let count = uriToLoad.Count(); +-- +1.7.3.4 +

1 0

[torbrowser/maint-2.2] Merge branch 'bug4192' into maint-2.2
by erinn＠torproject.org 10 Oct '11

10 Oct '11

commit 8b4c144be4445da48d8749c00475a48ce35a48f0 Merge: 022c82c dd8d5dc Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Oct 10 17:32:55 2011 +0100 Merge branch 'bug4192' into maint-2.2 ...owser-exit-when-not-launched-from-Vidalia.patch | 46 ++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-)

1 0

r25160: {website} Attempt to fix download links on some mirrors Report by exa (website/trunk/include)
by Sebastian Hahn 10 Oct '11

10 Oct '11

Author: sebastian Date: 2011-10-10 18:49:17 +0000 (Mon, 10 Oct 2011) New Revision: 25160 Modified: website/trunk/include/versions.wmi Log: Attempt to fix download links on some mirrors Report by exa from #tor, thanks! Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-10-09 08:09:12 UTC (rev 25159) +++ website/trunk/include/versions.wmi 2011-10-10 18:49:17 UTC (rev 25160) @@ -59,47 +59,47 @@ <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> -<define-tag package-win32-stable whitespace=delete>/dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>/dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> <define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> +<define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag> <define-tag file-win32-bundle-alpha whitespace=delete>vidalia-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> +<define-tag package-win32-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-alpha></define-tag> <define-tag file-win32-bridge-bundle-stable whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-bridge-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> +<define-tag package-win32-bridge-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-stable></define-tag> <define-tag file-win32-bridge-bundle-alpha whitespace=delete>vidalia-bridge-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-bridge-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> +<define-tag package-win32-bridge-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-bridge-bundle-alpha></define-tag> <define-tag file-win32-relay-bundle-stable whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-relay-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> +<define-tag package-win32-relay-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-stable></define-tag> <define-tag file-win32-relay-bundle-alpha whitespace=delete>vidalia-relay-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-relay-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> +<define-tag package-win32-relay-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-relay-bundle-alpha></define-tag> <define-tag file-win32-exit-bundle-stable whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-stable>-0.2.14.exe</define-tag> -<define-tag package-win32-exit-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> +<define-tag package-win32-exit-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-stable></define-tag> <define-tag file-win32-exit-bundle-alpha whitespace=delete>vidalia-exit-bundle-<version-win32-bundle-alpha>-0.2.14.exe</define-tag> -<define-tag package-win32-exit-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> +<define-tag package-win32-exit-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-win32-exit-bundle-alpha></define-tag> <define-tag file-osx-x86-bundle-stable whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-stable>-0.2.14-i386.dmg</define-tag> -<define-tag package-osx-x86-bundle-stable whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> +<define-tag package-osx-x86-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-stable></define-tag> <define-tag file-osx-x86-bundle-alpha whitespace=delete>vidalia-bundle-<version-osx-x86-bundle-alpha>-0.2.14-i386.dmg</define-tag> -<define-tag package-osx-x86-bundle-alpha whitespace=delete>/dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> +<define-tag package-osx-x86-bundle-alpha whitespace=delete>../dist/vidalia-bundles/<file-osx-x86-bundle-alpha></define-tag> -<define-tag package-osx-ppc-bundle-stable whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.14-ppc.dmg</define-tag> -<define-tag package-osx-ppc-bundle-alpha whitespace=delete>/dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.14-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-stable whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-stable>-0.2.14-ppc.dmg</define-tag> +<define-tag package-osx-ppc-bundle-alpha whitespace=delete>../dist/vidalia-bundles/vidalia-bundle-<version-osx-ppc-bundle-alpha>-0.2.14-ppc.dmg</define-tag> -<define-tag package-osx-x86-stable whitespace=delete>/dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> -<define-tag package-osx-x86-alpha whitespace=delete>/dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag> +<define-tag package-osx-x86-stable whitespace=delete>../dist/osx-x86/Tor-<version-osx-stable>-i386-Bundle.dmg</define-tag> +<define-tag package-osx-x86-alpha whitespace=delete>../dist/osx-x86/Tor-<version-osx-alpha>-i386-Bundle.dmg</define-tag> -<define-tag package-osx-ppc-stable whitespace=delete>/dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg</define-tag> -<define-tag package-osx-ppc-alpha whitespace=delete>/dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg</define-tag> +<define-tag package-osx-ppc-stable whitespace=delete>../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg</define-tag> +<define-tag package-osx-ppc-alpha whitespace=delete>../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg</define-tag> <define-tag file-source-stable whitespace=delete>tor-<version-stable>.tar.gz</define-tag> -<define-tag package-source-stable whitespace=delete>/dist/<file-source-stable></define-tag> +<define-tag package-source-stable whitespace=delete>../dist/<file-source-stable></define-tag> <define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag> -<define-tag package-source-alpha whitespace=delete>/dist/<file-source-alpha></define-tag> +<define-tag package-source-alpha whitespace=delete>../dist/<file-source-alpha></define-tag> <define-tag version-torbutton whitespace=delete>1.4.4 (9 Oct 2011)</define-tag> <define-tag version-hash-torbutton whitespace=delete>sha1:3f352e7d8577fc576a9011d858a8b34f4fea4b09</define-tag>

1 0