Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

diff --cc src/common/address.c
index 1946a5f5035497b1330470d6323f2e673d20ecf0,68ad63941161d5687c8314e1eeeeedb4d731f5ff..a2f4c93b915bbe0f0feb533462714f4552a7cff7
--- 1/src/common/address.c
--- 2/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 */
    }
  }
  

diff --cc src/common/address_set.c
Simple merge