commit 1116e0853a678f46511c75dac166cda4d340dc79 Author: David Fifield david@bamsoftware.com Date: Thu Aug 2 08:38:47 2012 -0700

Remove tor-ignore-bridge-failure.patch.

I haven't used this patch in a long time; it may be that it never did anything. I think the problems with reconnecting to a bridge had more to do with LearnCircuitBuildTimeout, which is now worked around in the configuration. --- README | 8 -------- patches/tor-ignore-bridge-failure.patch | 19 ------------------- 2 files changed, 0 insertions(+), 27 deletions(-)

diff --git a/README b/README index d6ad66d..f814ebe 100644 --- a/README +++ b/README @@ -85,14 +85,6 @@ port forwarding. Make sure someone is viewing http://crypto.stanford.edu/flashproxy/, or another web page with a flash proxy badge on it.

-Sometimes Tor can think that the bridge you reach through a proxy is -unreachable after the proxy is disconnected, even if there is another -proxy immediately available. If you are able to build Tor from source, -try applying the patch patches/tor-ignore-bridge-failure.patch. - $ git apply ~/flashproxy/patches/tor-ignore-bridge-failure.patch -or - $ patch -p1 < ~/flashproxy/patches/tor-ignore-bridge-failure.patch - If tor hangs at 10% with these messages: [notice] Bootstrapped 10%: Finishing handshake with directory server. [notice] no known bridge descriptors running yet; stalling diff --git a/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch deleted file mode 100644 index dd7290b..0000000 --- a/patches/tor-ignore-bridge-failure.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch causes Tor to ignore bridge reachability failures. This is -helpful when the bridge is only intermittently available, as when -connecting through a flash proxy. - -diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c -index f7d5524..0ffcf06 100644 ---- a/src/or/circuitbuild.c -+++ b/src/or/circuitbuild.c -@@ -3894,6 +3894,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, - int idx = -1; - char buf[HEX_DIGEST_LEN+1]; - -+ /* Ignore bridge reachability problems. */ -+ if (! succeeded) -+ return 0; -+ - if (! entry_guards) - return 0; -