From 39a9178ba779af4201f3b6cc6d9db4a70ac058dd Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@persephoneslair.org>
Date: Tue, 12 Jun 2012 12:24:05 -0700
Subject: [PATCH] Early exit from circuit_build_times_set_timeout() if adaptive
 timeouts are disabled

---
 src/or/circuitbuild.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 8efaa7cf4d..03b702bed9 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1598,6 +1598,12 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
   long prev_timeout = tor_lround(cbt->timeout_ms/1000);
   double timeout_rate;
 
+  /*
+   * Just return if we aren't using adaptive timeouts
+   */
+  if (circuit_build_times_disabled())
+    return;
+
   if (!circuit_build_times_set_timeout_worker(cbt))
     return;