diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-12-05 10:25:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-12-05 10:25:12 -0500 |
| commit | 46a321fbdde353d0c0b37556d7e3e81cd2b42979 (patch) | |
| tree | aa2a54179cab0d4898eb0702773c2ef9772d723d /src/feature/hs | |
| parent | 1eb3719a62074baef97ec1aa5c144096706fb97f (diff) | |
| parent | 967efc0d28ffdedfb52640456e4483dd2ee63e05 (diff) | |
| download | tor-46a321fbdde353d0c0b37556d7e3e81cd2b42979.tar.gz tor-46a321fbdde353d0c0b37556d7e3e81cd2b42979.zip | |
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/feature/hs')
| -rw-r--r-- | src/feature/hs/hs_service.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index ee0b64a969..623a239d50 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -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); |