commit 6e3ebf3b1e5ad7c762e940ba35b4f5fd991a4ad1 Author: David Fifield david@bamsoftware.com Date: Tue Jul 10 10:56:08 2012 -0700

Revert "Remove "CircuitBuildTimeout 60"."

This reverts commit 45509aa495e1f9366ca27fc23587940fb3039692.

This seems to be more than just a problem with a warning output. https://trac.torproject.org/projects/tor/ticket/6304#comment:2 --- experiments/exercise/exercise.sh | 2 +- torrc | 1 + 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/experiments/exercise/exercise.sh b/experiments/exercise/exercise.sh index 6a91806..13a6107 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 0.0.0.0:1" LearnCircuitBuildTimeout 0 & +"$TOR" ClientTransportPlugin "websocket socks4 127.0.0.1:$LOCAL_PORT" UseBridges 1 Bridge "websocket 0.0.0.0:1" LearnCircuitBuildTimeout 0 CircuitBuildTimeout 60 & PIDS_TO_KILL+=($!)

sleep 60 diff --git a/torrc b/torrc index b04e174..216c292 100644 --- a/torrc +++ b/torrc @@ -8,3 +8,4 @@ UseBridges 1 # The address and port are ignored by the client transport plugin. Bridge websocket 0.0.1.0:1 LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60