diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-04 14:57:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-04 14:57:06 -0500 |
| commit | fe3331b84554c6d6e2e633d77de02453b9a73f88 (patch) | |
| tree | 270201a0d08528abe1f545953dae90da470d37b3 /src/or | |
| parent | d47c9276de69ee206670844b4032965fbb497d3b (diff) | |
| parent | bf8bb9c526a7dc99ab56b6e4786737f4617bb4ed (diff) | |
| download | tor-fe3331b84554c6d6e2e633d77de02453b9a73f88.tar.gz tor-fe3331b84554c6d6e2e633d77de02453b9a73f88.zip | |
Merge branch 'maint-0.3.3' into maint-0.3.4
Diffstat (limited to 'src/or')
| -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 1b6316dabe..54ceb9dcad 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -3140,8 +3140,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); |