Merge branch 'maint-0.3.2' into maint-0.3.3

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

diff --cc src/test/test_hs_common.c
index 17ba11ca7d3a776ee48772d2ec3a2f7e62dec0ed,3ae623ed0ac4778eaa308689b032858f6840a33e..16803dbd16b1eadacbb5e1fc1727ba7462b85dac
--- 1/src/test/test_hs_common.c
--- 2/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. */

diff --cc src/test/test_hs_intropoint.c
Simple merge