Merge branch 'maint-0.3.5' into maint-0.4.3

diff --cc src/core/or/address_set.c
index fcddc55e9fdf64c3a2245050ecba99a14cb2e3ee,7ada4446c474c91e2457827876874e1ad036c38d..9bd3cc0f2d171dbb57348af6c7e8035f0516fc5c
--- 1/src/core/or/address_set.c
--- 2/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,

diff --cc src/core/or/address_set.h
Simple merge