aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-09-21 23:35:49 -0400
committerNick Mathewson <nickm@torproject.org>2009-09-21 23:35:49 -0400
commit6acfa31d5989ccb15812610669351b9206285905 (patch)
treea7989d10d498abb640f1ccf6248e6ba56bc0dd8a
parent5a9c9aa5263caa5b51f97a769f789abd649f14b5 (diff)
parentfd7454f9e30f39d6f026dfc08eb5a7a34d8bb08a (diff)
downloadtor-6acfa31d5989ccb15812610669351b9206285905.tar.gz
tor-6acfa31d5989ccb15812610669351b9206285905.zip
Merge commit 'mikeperry/circuittimeout-1103'
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index b1de024168..adf53a8b10 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -643,6 +643,8 @@ circuit_build_times_count_pretimeouts(circuit_build_times_t *cbt)
double timeout_quantile = 1.0-
((double)cbt->pre_timeouts)/
(cbt->pre_timeouts+cbt->total_build_times);
+ /* Make sure it doesn't exceed the synthetic max */
+ timeout_quantile *= MAX_SYNTHETIC_QUANTILE;
cbt->Xm = circuit_build_times_mode(cbt);
tor_assert(cbt->Xm > 0);
/* Use current timeout to get an estimate on alpha */