commit 92b4996b233a6a5d034b4ecc47b9f97985bb5886 Merge: f82f8179e 6e9d5fc4e Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 29 13:07:13 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/or/hs_client.c | 6 +++--- src/test/test_hs_common.c | 7 ++++++- src/test/test_hs_intropoint.c | 7 +++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --cc src/test/test_hs_common.c index 17ba11ca7,3ae623ed0..16803dbd1 --- 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. */