aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug68803
-rw-r--r--src/or/dirserv.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug6880 b/changes/bug6880
new file mode 100644
index 000000000..c08a2d40d
--- /dev/null
+++ b/changes/bug6880
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - Don't do reachability testing over IPv6 unless
+ AuthDirPublishIPv6 is set. Fix for bug 6880.
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index a8f2fb9de..d3556901a 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3415,7 +3415,8 @@ dirserv_single_reachability_test(time_t now, routerinfo_t *router)
router->cache_info.identity_digest);
/* Possible IPv6. */
- if (!tor_addr_is_null(&router->ipv6_addr)) {
+ if (get_options()->AuthDirHasIPv6Connectivity == 1 &&
+ !tor_addr_is_null(&router->ipv6_addr)) {
char addrstr[TOR_ADDR_BUF_LEN];
log_debug(LD_OR, "Testing reachability of %s at %s:%u.",
router->nickname,