commit 1150b6b43e0d27eaf8e285c6421226de0309809b Merge: 521cb58 8e07798 Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 15 11:23:06 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5259 | 3 +++ doc/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc doc/tor.1.txt index 98c97e7,5f10f68..3dbaa3a --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -781,14 -651,10 +781,15 @@@ The following options are useful only f **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 + client streams. A circuit is pending if we have begun constructing it, + but it has not yet been completely constructed. (Default: 32) + **NodeFamily** __node__,__node__,__...__:: The Tor servers, defined by their identity fingerprints or nicknames, constitute a "family" of similar or co-administered servers, so never use