[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

[nickm at torproject.org]

commit ef164346d4c6ee1b315e73917f3ec007b714a355
Merge: 4f98ec9fd 1555946e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 13 08:47:06 2018 -0500

    Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

 src/common/address.c     | 7 +++++--
 src/common/address_set.c | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc src/common/address.c
index 1946a5f50,68ad63941..a2f4c93b9
--- a/src/common/address.c
+++ b/src/common/address.c
@@@ -1193,14 -1192,14 +1196,14 @@@ tor_addr_hash(const tor_addr_t *addr
    case AF_INET:
      return siphash24g(&addr->addr.in_addr.s_addr, 4);
    case AF_UNSPEC:
-     return 0x4e4d5342;
+     return siphash24g(unspec_hash_input, sizeof(unspec_hash_input));
    case AF_INET6:
      return siphash24g(&addr->addr.in6_addr.s6_addr, 16);
 -  default:
      /* LCOV_EXCL_START */
 +  default:
      tor_fragile_assert();
      return 0;
 -    /* LCOV_EXCL_END */
 +    /* LCOV_EXCL_STOP */
    }
  }