aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorArthur Edelstein <arthuredelstein@gmail.com>2017-04-05 17:19:25 -0700
committerArthur Edelstein <arthuredelstein@gmail.com>2017-04-05 17:19:25 -0700
commit6f0edff399532b816a9fbd27a8fde7acaf01e36c (patch)
tree3ef34a9ed898998dc1f66ed65634ed27a62e73b2 /doc/tor.1.txt
parent0e5e5ba64bab49d056814bc933ab3c4c0a0f5a74 (diff)
downloadtor-6f0edff399532b816a9fbd27a8fde7acaf01e36c.tar.gz
tor-6f0edff399532b816a9fbd27a8fde7acaf01e36c.zip
Bug 21873: Clarify KeepAliveIsolateSOCKSAuth behavior
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 568771a123..568d037d98 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -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
services, this applies to the __last__ time a circuit was used, not the
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)
[[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
destination address.
**KeepAliveIsolateSOCKSAuth**;;
- If **IsolateSOCKSAuth** is enabled, keep alive circuits that have
- streams with SOCKS authentication set indefinitely.
+ If **IsolateSOCKSAuth** is enabled, keep alive circuits while they have
+ 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__;;
If no other isolation rules would prevent it, allow streams
on this port to share circuits with streams from every other