Merge branch 'maint-0.2.9' into release-0.2.9

src/test/test_hs.c

@@ -765,6 +765,8 @@ test_single_onion_poisoning(void *arg)
   tt_assert(ret == 0);
 
  done:
+  tor_free(dir1);
+  tor_free(dir2);
   /* The test harness deletes the directories at exit */
   smartlist_free(services);
   rend_service_free(service_1);