From: George Kadianakis <desnacked@riseup.net>
Date: Wed, 4 Sep 2013 11:20:42 +0000 (+0300)
Subject: Add Extended ORPort information to the man page.
X-Git-Tag: tor-0.2.5.1-alpha~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=386e9fb29775f972cfaac4653202811d4cfb4ff4;p=thirdparty%2Ftor.git

Add Extended ORPort information to the man page.
---

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ec00c093a2..737e7b4f8d 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