commit 5f0fa480dd94f4fec7b8b026dbd0a524f7b9c786 Merge: 6252e04a3 eb677c587 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 28 09:54:39 2017 -0400

Merge branch 'maint-0.3.1'

src/test/test_hs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --cc src/test/test_hs.c index 093c7ec35,5aae6c5b9..48acd9180 --- a/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.