[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.3

[dgoulet at torproject.org]

commit 890a9e89bab8378a511470787253a4aee14fafd0
Merge: cc5d5a5d1e f322ea3fa8
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 3 09:11:14 2021 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.3

 src/core/or/address_set.c | 75 -----------------------------------------------
 src/core/or/address_set.h | 15 ----------
 2 files changed, 90 deletions(-)

diff --cc src/core/or/address_set.c
index fcddc55e9f,7ada4446c4..9bd3cc0f2d
--- a/src/core/or/address_set.c
+++ b/src/core/or/address_set.c
@@@ -15,9 -15,8 +15,8 @@@
  #include "lib/net/address.h"
  #include "lib/container/bloomfilt.h"
  #include "lib/crypt_ops/crypto_rand.h"
- #include "siphash.h"
  
 -/* Wrap our hash function to have the signature that the bloom filter
 +/** Wrap our hash function to have the signature that the bloom filter
   * needs. */
  static uint64_t
  bloomfilt_addr_hash(const struct sipkey *key,