aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-10 13:20:14 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-10 13:20:14 -0400
commit6a647be54a8e88f94461f82e16b78a9113a1c351 (patch)
tree0fba642a929e9436b81d083497227e5effebcf48 /src/app
parent0c2bb9eac576d899b2ff8a8fa1be91762b4ee1be (diff)
parent401b3a8a3c823c6d0642cc323464e05a140f0351 (diff)
downloadtor-6a647be54a8e88f94461f82e16b78a9113a1c351.tar.gz
tor-6a647be54a8e88f94461f82e16b78a9113a1c351.zip
Merge remote-tracking branch 'tor-gitlab/mr/42'
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/resolve_addr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
index 172f698549..7ec5ae565a 100644
--- a/src/app/config/resolve_addr.c
+++ b/src/app/config/resolve_addr.c
@@ -85,7 +85,7 @@ resolved_addr_get_suggested(int family, tor_addr_t *addr_out)
void
resolved_addr_set_suggested(const tor_addr_t *addr)
{
- if (BUG(tor_addr_family(addr) != AF_INET ||
+ if (BUG(tor_addr_family(addr) != AF_INET &&
tor_addr_family(addr) != AF_INET6)) {
return;
}