From: David Goulet Date: Wed, 3 Nov 2021 13:53:31 +0000 (-0400) Subject: Merge branch 'maint-0.4.5' into maint-0.4.6 X-Git-Tag: tor-0.4.6.9~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83f8fe05e8f398f8f1a403b159284db5952d17de;p=thirdparty%2Ftor.git Merge branch 'maint-0.4.5' into maint-0.4.6 Signed-off-by: David Goulet --- 83f8fe05e8f398f8f1a403b159284db5952d17de diff --cc doc/man/tor.1.txt index 109e70f2ba,7c0071500e..0af9a9c03d --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@@ -2820,12 -2803,8 +2820,13 @@@ details. more than once, but only one advertised DirPort is supported: all but one DirPort must have the **NoAdvertise** flag set. (Default: 0) + + - The same flags are supported here as are supported by ORPort. + The same flags are supported here as are supported by ORPort. This port can + only be IPv4. + + + As of Tor 0.4.6.1-alpha, non-authoritative relays (see + AuthoritativeDirectory) will not publish the DirPort but will still listen + on it. Clients don't use the DirPorts on relays, so it is safe for you + to remove the DirPort from your torrc configuration. [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on