[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6

[dgoulet at torproject.org]

commit 83f8fe05e8f398f8f1a403b159284db5952d17de
Merge: 621f8ac418 ea5eebf431
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Nov 3 09:53:31 2021 -0400

    Merge branch 'maint-0.4.5' into maint-0.4.6
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>

 changes/ticket40494              |  5 +++++
 doc/man/tor.1.txt                |  3 ++-
 src/feature/relay/relay_config.c | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

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