diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-05-15 11:23:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-05-15 11:23:06 -0400 |
| commit | 1150b6b43e0d27eaf8e285c6421226de0309809b (patch) | |
| tree | a9dada6c7b3ce1fef3c67b4f80ca183c45556401 /doc | |
| parent | 521cb581877be404626446aa558cade649c13f03 (diff) | |
| parent | 8e07798284faba6cc2492ca98e50f2e8bcb70934 (diff) | |
| download | tor-1150b6b43e0d27eaf8e285c6421226de0309809b.tar tor-1150b6b43e0d27eaf8e285c6421226de0309809b.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 98c97e717..3dbaa3ab5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -781,8 +781,9 @@ The following options are useful only for clients (that is, if **MaxCircuitDirtiness** __NUM__:: Feel free to reuse a circuit that was first used at most NUM seconds ago, - but never attach a new stream to a circuit that is too old. (Default: 10 - minutes) + but never attach a new stream to a circuit that is too old. For hidden + services, this applies to the __last__ time a circuit was used, not the + first. (Default: 10 minutes) **MaxClientCircuitsPending** __NUM__:: Do not allow more than NUM circuits to be pending at a time for handling |