[tor-commits] [tor/master] Merge remote-tracking branch 'asn/ticket23056_v2'

[nickm at torproject.org]

commit e72dec18a98bef8fc16486bf5bea1d313845ece4
Merge: a229d6c2f 6d48e7568
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 12:09:03 2017 -0400

    Merge remote-tracking branch 'asn/ticket23056_v2'

 src/or/hs_common.c  |  4 +++
 src/or/hs_service.c | 87 ++++++++++++++++++++++++++++++++---------------------
 2 files changed, 57 insertions(+), 34 deletions(-)

diff --cc src/or/hs_service.c
index 5ff118222,4171a8e0a..4eb513629
--- a/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. */