Commit d17fcad3 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge commit 'mikeperry/bug1772' into maint-0.2.2

parents 3cbe463e 7eedd0f6

src/or/or.h

+1 −1
Original line number Diff line number Diff line
@@ -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)