summaryrefslogtreecommitdiff
path: root/src/common/address.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-12-05 08:17:01 -0500
committerNick Mathewson <nickm@torproject.org>2016-12-05 08:17:01 -0500
commit8230cf7ea601266a70e1cf1b7610d592c177496b (patch)
tree8837ea660ed89ac644e894343d78f5567702b66d /src/common/address.c
parentf7e8bd640a3c5e2227f991ea9ffe0fef3510d86d (diff)
parent7ffa95abd935fd6ac10abd96e8a8d14aa9035caf (diff)
downloadtor-8230cf7ea601266a70e1cf1b7610d592c177496b.tar.gz
tor-8230cf7ea601266a70e1cf1b7610d592c177496b.zip
Merge remote-tracking branch 'jryans/local-hostname'
Diffstat (limited to 'src/common/address.c')
-rw-r--r--src/common/address.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/address.c b/src/common/address.c
index 773e688554..fa6630ef92 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -2100,7 +2100,8 @@ get_interface_address,(int severity, uint32_t *addr))
}
/** Return true if we can tell that <b>name</b> is a canonical name for the
- * loopback address. */
+ * loopback address. Return true also for *.local hostnames, which are
+ * multicast DNS names for hosts on the local network. */
int
tor_addr_hostname_is_local(const char *name)
{