From: Nick Mathewson Date: Fri, 29 Jun 2018 17:07:13 +0000 (-0400) Subject: Merge branch 'maint-0.3.2' into maint-0.3.3 X-Git-Tag: tor-0.3.3.8~12^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=92b4996b233a6a5d034b4ecc47b9f97985bb5886;p=thirdparty%2Ftor.git Merge branch 'maint-0.3.2' into maint-0.3.3 --- 92b4996b233a6a5d034b4ecc47b9f97985bb5886 diff --cc src/test/test_hs_common.c index 17ba11ca7d,3ae623ed0a..16803dbd16 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@@ -302,11 -303,11 +303,12 @@@ helper_add_hsdir_to_networkstatus(netwo memset(&ri->cache_info.signing_key_cert->signing_key, identity_idx, ED25519_PUBKEY_LEN); tt_assert(nodelist_set_routerinfo(ri, NULL)); - node_t *node = node_get_mutable_by_id(ri->cache_info.identity_digest); + + node = node_get_mutable_by_id(ri->cache_info.identity_digest); tt_assert(node); node->rs = rs; - /* We need this to exist for node_has_descriptor() to return true. */ + /* We need this to exist for node_has_preferred_descriptor() to return + * true. */ node->md = tor_malloc_zero(sizeof(microdesc_t)); /* Do this now the nodelist_set_routerinfo() function needs a "rs" to set * the indexes which it doesn't have when it is called. */