summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-04 18:34:39 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-04 18:34:39 -0400
commit4d87919ba649790a2a6c446d112dd2a8ad34862d (patch)
treead01a5365b8b92435391e17eb08698addde2b791 /src/or
parentd7a646edcfbceaab412bc1558ec83a3551c2c8a4 (diff)
parentacfd487e7dbf5fa1408a2bba7afff54bc7d0118e (diff)
downloadtor-4d87919ba649790a2a6c446d112dd2a8ad34862d.tar.gz
tor-4d87919ba649790a2a6c446d112dd2a8ad34862d.zip
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuituse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index c34b698fa1..20f124eb4e 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);