From: Nick Mathewson Date: Mon, 4 Sep 2017 16:09:03 +0000 (-0400) Subject: Merge remote-tracking branch 'asn/ticket23056_v2' X-Git-Tag: tor-0.3.2.1-alpha~120 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e72dec18a98bef8fc16486bf5bea1d313845ece4;p=thirdparty%2Ftor.git Merge remote-tracking branch 'asn/ticket23056_v2' --- e72dec18a98bef8fc16486bf5bea1d313845ece4 diff --cc src/or/hs_service.c index 5ff118222d,4171a8e0ac..4eb5136298 --- 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. */