aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-11-03 09:53:31 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-11-03 09:53:31 -0400
commit83f8fe05e8f398f8f1a403b159284db5952d17de (patch)
tree7975f376842c82d556bc35524a93590def402c4e /doc
parent621f8ac418e1441c9fe568b015058438daba6616 (diff)
parentea5eebf431c732b8f1c0e9daa9b7b716c48bc76f (diff)
downloadtor-83f8fe05e8f398f8f1a403b159284db5952d17de.tar.gz
tor-83f8fe05e8f398f8f1a403b159284db5952d17de.zip
Merge branch 'maint-0.4.5' into maint-0.4.6
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/man/tor.1.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 109e70f2ba..0af9a9c03d 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2820,7 +2820,8 @@ 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