nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2012-05-15 11:23:06 -04:00
commit 1150b6b43e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug5259 Normal file
View File

@ -0,0 +1,3 @@
o Documentation fixes:
- Clarify the behavior of MaxCircuitDirtiness with hidden service
circuits. Fix for issue 5259.

5
doc/tor.1.txt
View File

@ -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