summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug54373
-rw-r--r--doc/tor.1.txt3
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug5437 b/changes/bug5437
new file mode 100644
index 0000000000..3f9e96dcfe
--- /dev/null
+++ b/changes/bug5437
@@ -0,0 +1,3 @@
+ o Documentation fixes:
+ - Clarify SessionGroup documentation slightly; resolves bug 5437.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 16bfd23bb6..dcbc3136de 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -841,7 +841,8 @@ The following options are useful only for clients (that is, if
If no other isolation rules would prevent it, allow streams
on this port to share circuits with streams from every other
port with the same session group. (By default, streams received
- on different ports are always isolated from one another.)
+ on different SOCKSPorts, TransPorts, etc are always isolated from one
+ another. This option overrides that behavior.)
**SOCKSListenAddress** __IP__[:__PORT__]::
Bind to this address to listen for connections from Socks-speaking