[tor-commits] [tor/maint-0.2.3] Make begindir_cutoff the same as general_cutoff

[nickm at torproject.org]

commit eb3d0796677b5d37f27caf8b11d2a2e2c18e5674
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 1 01:25:17 2012 -0400

    Make begindir_cutoff the same as general_cutoff
    
    Allow one-hop directory fetching circuits the full "circuit build timeout"
    period, rather than just half of it, before failing them and marking
    the relay down. This fix should help reduce cases where clients declare
    relays (or worse, bridges) unreachable because the TLS handshake takes
    a few seconds to complete.
    
    Fixes bug 6743 (one piece of bug 3443); bugfix on 0.2.2.2-alpha, where
    we changed the timeout from a static 30 seconds.
---
 changes/bug6743     |    9 +++++++++
 src/or/circuituse.c |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/changes/bug6743 b/changes/bug6743
new file mode 100644
index 0000000..6ec78f8
--- /dev/null
+++ b/changes/bug6743
@@ -0,0 +1,9 @@
+  o Minor bugfixes:
+    - Allow one-hop directory fetching circuits the full "circuit build
+      timeout" period, rather than just half of it, before failing them
+      and marking the relay down. This fix should help reduce cases where
+      clients declare relays (or worse, bridges) unreachable because
+      the TLS handshake takes a few seconds to complete. Fixes bug 6743;
+      bugfix on 0.2.2.2-alpha, where we changed the timeout from a static
+      30 seconds.
+
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index c34b698..20f124e 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -372,7 +372,7 @@ circuit_expire_building(void)
   } while (0)
 
   SET_CUTOFF(general_cutoff, circ_times.timeout_ms);
-  SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0);
+  SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms);
   SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0));
   SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0);
   SET_CUTOFF(close_cutoff, circ_times.close_ms);