summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorYawning Angel <yawning@schwanenlied.me>2015-09-01 16:30:48 +0000
committerNick Mathewson <nickm@torproject.org>2015-09-08 14:02:08 -0400
commit54510d4d1a66d2dd9a618699bd2e51bf4ade4dea (patch)
tree65cc4e1666368fffa57b4b1d0e8df14b0b81611c /doc
parenta16115d9cb8c2e88da8a59c212155e2fd0e16aa3 (diff)
downloadtor-54510d4d1a66d2dd9a618699bd2e51bf4ade4dea.tar.gz
tor-54510d4d1a66d2dd9a618699bd2e51bf4ade4dea.zip
Add `KeepAliveIsolateSOCKSAuth` as a SOCKSPort option.
This controls the circuit dirtyness reset behavior added for Tor Browser's user experience fix (#15482). Unlike previous iterations of this patch, the tunable actually works, and is documented.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index af99570bd4..803fd187c9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -934,7 +934,9 @@ The following options are useful only for clients (that is, if
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. For hidden
services, this applies to the __last__ time a circuit was used, not the
- first. (Default: 10 minutes)
+ first. Circuits with streams constructed with SOCKS authentication via
+ SocksPorts that have **KeepAliveIsolateSOCKSAuth** ignore this value.
+ (Default: 10 minutes)
[[MaxClientCircuitsPending]] **MaxClientCircuitsPending** __NUM__::
Do not allow more than NUM circuits to be pending at a time for handling
@@ -991,6 +993,9 @@ The following options are useful only for clients (that is, if
**IsolateDestAddr**;;
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.
**SessionGroup=**__INT__;;
If no other isolation rules would prevent it, allow streams
on this port to share circuits with streams from every other