summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/tor.1.txt11
-rw-r--r--src/or/config.c2
2 files changed, 6 insertions, 7 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 93bde59d3f..9a8de25921 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1747,12 +1747,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS
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)
HIDDEN SERVICE OPTIONS
----------------------
diff --git a/src/or/config.c b/src/or/config.c
index 8c41c7f53d..60276688ce 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -204,7 +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, AUTOBOOL, "0"),
VAR("AuthoritativeDirectory", BOOL, AuthoritativeDir, "0"),
V(AutomapHostsOnResolve, BOOL, "0"),
V(AutomapHostsSuffixes, CSV, ".onion,.exit"),