diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-04 14:49:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-04 14:49:16 -0500 |
| commit | bf8bb9c526a7dc99ab56b6e4786737f4617bb4ed (patch) | |
| tree | 0080105537499f23cda6998f15645d9596b9c672 /src | |
| parent | 1ea3127188f7c35ee6fab1db65afa3c84033045b (diff) | |
| parent | d37dbb09c2e8867cf2b87dc45e8646351754e94a (diff) | |
| download | tor-bf8bb9c526a7dc99ab56b6e4786737f4617bb4ed.tar.gz tor-bf8bb9c526a7dc99ab56b6e4786737f4617bb4ed.zip | |
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/hs_service.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 4c67aff429..3273705ae9 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -3105,8 +3105,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); |