nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.3' into maint-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2019-01-04 14:57:06 -05:00
commit fe3331b845
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug28619 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (hidden service v3):
- When deleting an ephemeral onion service (DEL_ONION), do not close any
rendezvous circuits in order to let the existing client connections
finish by themselves or closed by the application. The HS v2 is doing
that already so now we have the same behavior for all versions. Fixes
bug 28619; bugfix on 0.3.3.1-alpha.

6
src/or/hs_service.c
View File

@ -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);