Merge remote-tracking branch 'asn/ticket23056_v2'

diff --cc src/or/hs_common.c
Simple merge

diff --cc src/or/hs_service.c
index 5ff118222d13e18ca3a986ee47bdbf0fb9de78f0,4171a8e0ac04403ff3e5a12ba254fb187bdb0ad8..4eb51362983898bf8caf0d4f8b68e7906f84a67e
--- 1/src/or/hs_service.c
--- 2/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@@ -72,12 -72,8 +72,13 @@@ static const char address_tld[] = "onio
   * loading keys requires that we are an actual running tor process. */
  static smartlist_t *hs_service_staging_list;
  
 +/** True if the list of available router descriptors might have changed which
 + *  might result in an altered hash ring. Check if the hash ring changed and
 + *  reupload if needed */
 +static int consider_republishing_hs_descriptors = 0;
 +
  static void set_descriptor_revision_counter(hs_descriptor_t *hs_desc);
+ static void move_descriptors(hs_service_t *src, hs_service_t *dst);
  
  /* Helper: Function to compare two objects in the service map. Return 1 if the
   * two service have the same master public identity key. */