瀏覽代碼

manpage: Clarify that Tor does stream isolation between *Port listeners by default

cherry-pick of tor-github/pr/841 to maint-0.4.0.
rl1987 5 年之前
父節點
當前提交
61e6b217c5
共有 2 個文件被更改,包括 14 次插入3 次删除
  1. 3 0
      changes/doc29121
  2. 11 3
      doc/tor.1.txt

+ 3 - 0
changes/doc29121

@@ -0,0 +1,3 @@
+  o Documentation:
+    - Clarify that Tor performs stream isolation between *Port listeners by
+      default. Resolves issue 29121.

+ 11 - 3
doc/tor.1.txt

@@ -1230,6 +1230,8 @@ The following options are useful only for clients (that is, if
         information to anybody watching your network, and allow anybody
         information to anybody watching your network, and allow anybody
         to use your computer as an open proxy. +
         to use your computer as an open proxy. +
  +
  +
+    If multiple entries of this option are present in your configuration
+    file, Tor will perform stream isolation between listeners by default.
     The _isolation flags_ arguments give Tor rules for which streams
     The _isolation flags_ arguments give Tor rules for which streams
     received on this SocksPort are allowed to share circuits with one
     received on this SocksPort are allowed to share circuits with one
     another.  Recognized isolation flags are:
     another.  Recognized isolation flags are:
@@ -1472,14 +1474,18 @@ The following options are useful only for clients (that is, if
     protocol instead of SOCKS. Set this to
     protocol instead of SOCKS. Set this to
     0 if you don't want to allow "HTTP CONNECT" connections. Set the port
     0 if you don't want to allow "HTTP CONNECT" connections. Set the port
     to "auto" to have Tor pick a port for you. This directive can be
     to "auto" to have Tor pick a port for you. This directive can be
-    specified multiple times to bind to multiple addresses/ports.  See
+    specified multiple times to bind to multiple addresses/ports. If multiple
+    entries of this option are present in your configuration file, Tor will
+    perform stream isolation between listeners by default. See
     SOCKSPort for an explanation of isolation flags. (Default: 0)
     SOCKSPort for an explanation of isolation flags. (Default: 0)
 
 
 [[TransPort]] **TransPort**  \['address':]__port__|**auto** [_isolation flags_]::
 [[TransPort]] **TransPort**  \['address':]__port__|**auto** [_isolation flags_]::
     Open this port to listen for transparent proxy connections.  Set this to
     Open this port to listen for transparent proxy connections.  Set this to
     0 if you don't want to allow transparent proxy connections.  Set the port
     0 if you don't want to allow transparent proxy connections.  Set the port
     to "auto" to have Tor pick a port for you. This directive can be
     to "auto" to have Tor pick a port for you. This directive can be
-    specified multiple times to bind to multiple addresses/ports.  See
+    specified multiple times to bind to multiple addresses/ports. If multiple
+    entries of this option are present in your configuration file, Tor will
+    perform stream isolation between listeners by default.  See
     SOCKSPort for an explanation of isolation flags. +
     SOCKSPort for an explanation of isolation flags. +
  +
  +
     TransPort requires OS support for transparent proxies, such as BSDs' pf or
     TransPort requires OS support for transparent proxies, such as BSDs' pf or
@@ -1516,7 +1522,9 @@ The following options are useful only for clients (that is, if
     included in old versions of FreeBSD, etc) using the NATD protocol.
     included in old versions of FreeBSD, etc) using the NATD protocol.
     Use 0 if you don't want to allow NATD connections.  Set the port
     Use 0 if you don't want to allow NATD connections.  Set the port
     to "auto" to have Tor pick a port for you. This directive can be
     to "auto" to have Tor pick a port for you. This directive can be
-    specified multiple times to bind to multiple addresses/ports.  See
+    specified multiple times to bind to multiple addresses/ports.  If multiple
+    entries of this option are present in your configuration file, Tor will
+    perform stream isolation between listeners by default. See
     SocksPort for an explanation of isolation flags. +
     SocksPort for an explanation of isolation flags. +
  +
  +
     This option is only for people who cannot use TransPort. (Default: 0)
     This option is only for people who cannot use TransPort. (Default: 0)