aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorSteven Murdoch <Steven.Murdoch@cl.cam.ac.uk>2010-06-16 19:47:06 +0100
committerNick Mathewson <nickm@torproject.org>2010-09-30 11:40:37 -0400
commita6dc00fa75fcb089837c50ba1af7a25e5e6e6b20 (patch)
tree989f64598746e21913ddab1b3557cb3136a05876 /doc/tor.1.txt
parent3eaa9a376c756b0b8f836c4a78c3cf4012d6ffd7 (diff)
downloadtor-a6dc00fa75fcb089837c50ba1af7a25e5e6e6b20.tar.gz
tor-a6dc00fa75fcb089837c50ba1af7a25e5e6e6b20.zip
Start tor-fw-helper in the background, and log whatever it outputs
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index e670bdb6b7..42eed6e3dd 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -873,6 +873,18 @@ is non-zero):
specified in ORPort. (Default: 0.0.0.0) This directive can be specified
multiple times to bind to multiple addresses/ports.
+**PortForwarding** **0**|**1**::
+ Attempt to automatically forward the DirPort and ORPort on a NAT router
+ connecting this Tor server to the Internet. If set, Tor will try both
+ NAT-PMP (common on Apple routers) and UPnP (common on routers from other
+ manufacturers). (Default: 0)
+
+**PortForwardingHelper** __filename__|__pathname__::
+ If PortForwarding is set, use this executable to configure the forwarding.
+ If set to a filename, the system path will be searched for the executable.
+ If set to a path, only the specified path will be executed.
+ (Default: tor-fw-helper)
+
**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**::
This option is only considered if you have an ORPort defined. You can
choose multiple arguments, separated by commas.