Merge branch 'maint-0.4.5' into maint-0.4.6

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --cc doc/man/tor.1.txt
index 109e70f2ba63fa9237f0a38f765aa4cf3885de6c,7c0071500e321348b2b5c887279341f7ca3596e1..0af9a9c03d5c97a8be7d27d8c06b5824871dcd6c
--- 1/doc/man/tor.1.txt
--- 2/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

diff --cc src/feature/relay/relay_config.c
Simple merge