From: Mike Perry <mikeperry-git@fscked.org>
Date: Tue, 22 Sep 2009 03:01:20 +0000 (-0700)
Subject: Fix Bug 1103.
X-Git-Tag: tor-0.2.2.3-alpha~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd7454f9e30f39d6f026dfc08eb5a7a34d8bb08a;p=thirdparty%2Ftor.git

Fix Bug 1103.

Don't pass in a quantile that is too high during pretimeout
calcualtion.
---

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 */