commit 45509aa495e1f9366ca27fc23587940fb3039692 Author: David Fifield david@bamsoftware.com Date: Thu Jul 5 02:53:10 2012 -0700

Remove "CircuitBuildTimeout 60".

The warning referred to in e66c2962 seems to be a bug only in the warning, and the default timeout is actually in effect. See Trac ticket --- experiments/exercise/exercise.sh | 2 +- torrc | 1 - 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index dc6ca42..117b2f5 100755 --- a/experiments/exercise/exercise.sh +++ b/experiments/exercise/exercise.sh @@ -26,7 +26,7 @@ PIDS_TO_KILL+=($!)

sleep 20

-"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 127.0.0.1:$LOCAL_PORT" LearnCircuitBuildTimeout 0 & PIDS_TO_KILL+=($!)

sleep 60 diff --git a/torrc b/torrc index c25a6c5..36b4f93 100644 --- a/torrc +++ b/torrc @@ -7,4 +7,3 @@ ClientTransportPlugin websocket socks4 127.0.0.1:9001 UseBridges 1 Bridge websocket 127.0.0.1:9001 LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60