diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-11 11:08:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-11 11:08:20 -0400 |
| commit | d25fed51746e848fc04cabefe58133e3957209de (patch) | |
| tree | 87d7b520a09624945f791084f04bc6e8423412e5 /doc | |
| parent | 5a9696fad864406d7d65cc25e356c543957e596f (diff) | |
| parent | 7b2c856785b226ee20867450daa8436c3020e950 (diff) | |
| download | tor-d25fed51746e848fc04cabefe58133e3957209de.tar.gz tor-d25fed51746e848fc04cabefe58133e3957209de.zip | |
Merge remote-tracking branch 'yawning-schwanenlied/bug20261'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9f4eb31445..354478a42e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1046,8 +1046,9 @@ The following options are useful only for clients (that is, if another. Recognized isolation flags are: **IsolateClientAddr**;; Don't share circuits with streams from a different - client address. (On by default and strongly recommended; - you can disable it with **NoIsolateClientAddr**.) + client address. (On by default and strongly recommended when + supported; you can disable it with **NoIsolateClientAddr**. + Unsupported and force-disabled when using Unix domain sockets.) **IsolateSOCKSAuth**;; Don't share circuits with streams for which different SOCKS authentication was provided. (On by default; |