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

Merge remote-tracking branch 'arthuredelstein/21873'

Browse Source
This commit is contained in:
Nick Mathewson 2017-04-06 11:57:14 -04:00
commit b47aecbe76
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/tor.1.txt
View File

@ -1055,7 +1055,8 @@ The following options are useful only for clients (that is, if
but never attach a new stream to a circuit that is too old. For hidden 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 services, this applies to the __last__ time a circuit was used, not the
first. Circuits with streams constructed with SOCKS authentication via first. Circuits with streams constructed with SOCKS authentication via
SocksPorts that have **KeepAliveIsolateSOCKSAuth** ignore this value. SocksPorts that have **KeepAliveIsolateSOCKSAuth** also remain alive
for MaxCircuitDirtiness seconds after carrying the last such stream.
(Default: 10 minutes) (Default: 10 minutes)
[[MaxClientCircuitsPending]] **MaxClientCircuitsPending** __NUM__:: [[MaxClientCircuitsPending]] **MaxClientCircuitsPending** __NUM__::
@ -1117,8 +1118,9 @@ The following options are useful only for clients (that is, if
Don't share circuits with streams targeting a different Don't share circuits with streams targeting a different
destination address. destination address.
**KeepAliveIsolateSOCKSAuth**;; **KeepAliveIsolateSOCKSAuth**;;
If **IsolateSOCKSAuth** is enabled, keep alive circuits that have If **IsolateSOCKSAuth** is enabled, keep alive circuits while they have
streams with SOCKS authentication set indefinitely. at least one stream with SOCKS authentication active. After such a circuit
is idle for more than MaxCircuitDirtiness seconds, it can be closed.
**SessionGroup=**__INT__;; **SessionGroup=**__INT__;;
If no other isolation rules would prevent it, allow streams If no other isolation rules would prevent it, allow streams
on this port to share circuits with streams from every other on this port to share circuits with streams from every other