Merge remote-tracking branch 'linus/bug6770_3'

Conflicts:
	doc/tor.1.txt
	src/or/config.c

diff --cc doc/tor.1.txt
index 93bde59d3f4acea56f86eee8971d63563a437c2d,c4fac40d4c5510f112efb4768f0c934b7550c1cf..9a8de25921c59a9ef99007f55d3fe9ce996051f2
--- 1/doc/tor.1.txt
--- 2/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -1747,13 -1747,19 +1747,12 @@@ DIRECTORY AUTHORITY SERVER OPTION
      votes on whether to accept relays as hidden service directories.
      (Default: 1)
  
- **AuthDirHasIPv6Connectivity** **0**|**1**|**auto**::
- 
-     Authoritative directories only. When set to 1, IPv6 OR ports are
-     being tested for reachability and voted on. When set to auto, Tor
-     tries to find out if the authority relay has IPv6 connectivity or
-     not. (Default: auto)
+ **AuthDirHasIPv6Connectivity** **0**|**1**::
 -
+     Authoritative directories only. When set to 0, OR ports with an
+     IPv6 address are being accepted without reachability testing.
+     When set to 1, IPv6 OR ports are being tested just like IPv4 OR
+     ports. (Default: 0)
  
 -**AuthDirPublishIPv6** **0**|**1**::
 -
 -    Authoritative directories only. When set to 0, Tor will not
 -    include IPv6 OR ports in votes. When set to 1, Tor will vote for
 -    IPv6 OR ports. (Default: 0).
 -
  HIDDEN SERVICE OPTIONS
  ----------------------
  

diff --cc src/or/config.c
index 8c41c7f53dd5d9f4e9102d1249ba92e904f1903a,949d1a2bbf4b078c5445c2ad7cbb3563f64b29c4..60276688ce413f9de6407da69ab390b2e0d8e1c3
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -204,7 -204,8 +204,7 @@@ static config_var_t _option_vars[] = 
    V(AuthDirListBadExits,         BOOL,     "0"),
    V(AuthDirMaxServersPerAddr,    UINT,     "2"),
    V(AuthDirMaxServersPerAuthAddr,UINT,     "5"),
-   V(AuthDirHasIPv6Connectivity,  AUTOBOOL, "auto"),
 -  V(AuthDirHasIPv6Connectivity,  BOOL,     "0"),
 -  V(AuthDirPublishIPv6,          BOOL,     "0"),
++  V(AuthDirHasIPv6Connectivity,  AUTOBOOL, "0"),
    VAR("AuthoritativeDirectory",  BOOL, AuthoritativeDir,    "0"),
    V(AutomapHostsOnResolve,       BOOL,     "0"),
    V(AutomapHostsSuffixes,        CSV,      ".onion,.exit"),