aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2013-09-04 14:20:42 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2013-09-04 14:20:42 +0300
commit386e9fb29775f972cfaac4653202811d4cfb4ff4 (patch)
tree735f1d43fd84e8bd9e3c6de22df8c08c42e0a396 /doc
parent11352b0ce152624553c7e698242144c2470db362 (diff)
downloadtor-386e9fb29775f972cfaac4653202811d4cfb4ff4.tar
tor-386e9fb29775f972cfaac4653202811d4cfb4ff4.tar.gz
Add Extended ORPort information to the man page.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ec00c093a..737e7b4f8 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -191,6 +191,15 @@ GENERAL OPTIONS
any pluggable transport proxy that tries to launch __transport__. +
(Example: ServerTransportOptions obfs45 shared-secret=bridgepasswd cache=/var/lib/tor/cache)
+**ExtORPort** \['address':]__port__|**auto**
+ Open this port to listen for Extended ORPort connections from your
+ pluggable transports.
+
+**ExtORPortCookieAuthFile** __Path__::
+ If set, this option overrides the default location and file name
+ for the Extended ORPort's cookie file -- the cookie file is needed
+ for pluggable transports to communicate through the Extended ORPort.
+
**ConnLimit** __NUM__::
The minimum number of file descriptors that must be available to the Tor
process before it will start. Tor will ask the OS for as many file