summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-09-30 00:00:06 -0400
committerRoger Dingledine <arma@torproject.org>2010-09-30 00:00:06 -0400
commitd17fcad3ae183d9a9bc9a0e3d1c159b6d8c261b8 (patch)
treec031fb0c36577ca838def9b517c434b1892c3c63
parent3cbe463e964d71b401e11b29dc356bf6ef855f7f (diff)
parent7eedd0f6bc6843a5fdd755dc68183296a2ad54bc (diff)
downloadtor-d17fcad3ae183d9a9bc9a0e3d1c159b6d8c261b8.tar.gz
tor-d17fcad3ae183d9a9bc9a0e3d1c159b6d8c261b8.zip
Merge commit 'mikeperry/bug1772' into maint-0.2.2
-rw-r--r--src/or/or.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 9f93f112b2..2e65459d46 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3002,7 +3002,7 @@ double circuit_build_times_quantile_cutoff(void);
#define CBT_DEFAULT_TEST_FREQUENCY 60
/** Lowest allowable value for CircuitBuildTimeout in milliseconds */
-#define CBT_DEFAULT_TIMEOUT_MIN_VALUE (2*1000)
+#define CBT_DEFAULT_TIMEOUT_MIN_VALUE (1500)
/** Initial circuit build timeout in milliseconds */
#define CBT_DEFAULT_TIMEOUT_INITIAL_VALUE (60*1000)