aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt16
1 files changed, 10 insertions, 6 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 69452a02f..ee1e0866e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1183,18 +1183,22 @@ The following options are useful only for clients (that is, if
compatibility, TransListenAddress is only allowed when TransPort is just
a port number.)
-[[TransTPROXY]] **TransTPROXY** **0**|**1**::
- TransTPROXY may only be enabled when there is transparent proxy listener
- enabled and only for Linux.
+[[TransProxyType]] **TransProxyTYpe** **default**|**TPROXY**::
+ TransProxyType may only be enabled when there is transparent proxy listener
+ enabled.
+
- Set this 1 if you wish to be able to use the TPROXY linux module to
+ Set this to TPROXY if you wish to be able to use the TPROXY Linux module to
transparently proxy connections that are configured using the TransPort
option. This setting lets the listener on the TransPort accept connections
for all addresses, even when the TransListenAddress is configured for an
internal address. Detailed information on how to configure the TPROXY
- feature can be found in the Linux kernel source tree in the file
+ feature can be found in the Linux kernel source tree in the file
Documentation/networking/tproxy.txt.
- (Default: 0)
+ +
+ Set this to "default", or leave it unconfigured, to use regular IPTables
+ on Linux, or to use pf on the *BSD operating systems.
+ +
+ (Default: "default".)
[[NATDPort]] **NATDPort** \['address':]__port__|**auto** [_isolation flags_]::
Open this port to listen for connections from old versions of ipfw (as