diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-06-29 18:57:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-06-29 18:57:50 -0400 |
| commit | bea55766af461e4ca78a4919912f3aa9de978bdc (patch) | |
| tree | 4de1f70487f1f0377e5d11a7c1329f70625ba59a /doc/tor.1.txt | |
| parent | 1d5b2da3a8273797817747e08a3a0b6726cb060a (diff) | |
| parent | 5dbf99d9ff59e69c064acda31495486635f8b844 (diff) | |
| download | tor-bea55766af461e4ca78a4919912f3aa9de978bdc.tar.gz tor-bea55766af461e4ca78a4919912f3aa9de978bdc.zip | |
Merge remote branch 'mikeperry/cbt-bugfixes3'
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 15ecb79eba..72b091bbbb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -419,9 +419,16 @@ The following options are useful only for clients (that is, if fingerprint to look up the bridge descriptor at the bridge authority, if it's provided and if UpdateBridgesFromAuthority is set too. +**LearnCircuitBuildTimeout** **0**|**1**:: + If 0, CircuitBuildTimeout adaptive learning is disabled. (Default: 1) + **CircuitBuildTimeout** __NUM__:: + Try for at most NUM seconds when building circuits. If the circuit isn't - open in that time, give up on it. (Default: 1 minute.) + open in that time, give up on it. If LearnCircuitBuildTimeout is 1, this + value serves as the initial value to use before a timeout is learned. If + LearnCircuitBuildTimeout is 0, this value is the only value used. + (Default: 60 seconds.) **CircuitIdleTimeout** __NUM__:: If we have kept a clean (never used) circuit around for NUM seconds, then |