Merge branch 'maint-0.3.1'

diff --cc src/test/test_hs.c
index 093c7ec35ef2ab60b38225c3ef1cb972b2654b64,5aae6c5b97e99c389fcdcff8484ea520f0d4007d..48acd918082a320bf6b8f87306a1bbe60428056f
--- 1/src/test/test_hs.c
--- 2/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@@ -661,9 -572,19 +661,10 @@@ test_single_onion_poisoning(void *arg
    char *dir2 = tor_strdup(get_fname_rnd("test_hs_dir2"));
    smartlist_t *services = smartlist_new();
    char *poison_path = NULL;
+   char *err_msg = NULL;
  
 -  /* No services, no service to verify, no problem! */
 -  mock_options->HiddenServiceSingleHopMode = 0;
 -  mock_options->HiddenServiceNonAnonymousMode = 0;
 -  ret = rend_config_services(mock_options, 1);
 -  tt_assert(ret == 0);
 -
 -  /* Either way, no problem. */
    mock_options->HiddenServiceSingleHopMode = 1;
    mock_options->HiddenServiceNonAnonymousMode = 1;
 -  ret = rend_config_services(mock_options, 1);
 -  tt_assert(ret == 0);
  
    /* Create the data directory, and, if the correct bit in arg is set,
     * create a directory for that service.