Merge remote-tracking branch 'tor-github/pr/546' into maint-0.3.5

This commit is contained in:
Nick Mathewson
2018-12-05 10:23:28 -05:00
2 changed files with 10 additions and 2 deletions
+4 -2
View File
@@ -3627,8 +3627,10 @@ hs_service_del_ephemeral(const char *address)
goto err;
}
/* Close circuits, remove from map and finally free. */
close_service_circuits(service);
/* Close introduction circuits, remove from map and finally free. Notice
* that the rendezvous circuits aren't closed in order for any existing
* connections to finish. We let the application terminate them. */
close_service_intro_circuits(service);
remove_service(hs_service_map, service);
hs_service_free(service);