[tor-commits] [flashproxy/master] Regen tor-ignore-bridge-failure.patch and use git a/b prefixes.

[dcf at torproject.org]

commit 4d7607575e3bffec622b0983c40b633f5a22d94d
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Oct 16 12:48:17 2011 -0700

    Regen tor-ignore-bridge-failure.patch and use git a/b prefixes.
---
 patches/tor-ignore-bridge-failure.patch |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch
index fa50366..dd7290b 100644
--- a/patches/tor-ignore-bridge-failure.patch
+++ b/patches/tor-ignore-bridge-failure.patch
@@ -2,11 +2,11 @@ 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 src/or/circuitbuild.c src/or/circuitbuild.c
-index ac0df91..1794634 100644
---- src/or/circuitbuild.c
-+++ src/or/circuitbuild.c
-@@ -3855,6 +3855,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded,
+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];