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

Merge remote-tracking branch 'dgoulet/bug18604_029_01'

Browse Source
This commit is contained in:
Nick Mathewson 2016-06-17 09:07:41 -04:00
commit 9a63f059b9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug18604 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (ephemeral hidden service)
- When deleting an ephemeral hidden service, close its intro points even
if not in the open state. Resolves ticket #18604; bugfix on
tor-0.2.7.1-alpha.

1
src/or/rendservice.c
View File

@ -926,7 +926,6 @@ rend_service_del_ephemeral(const char *service_id)
*/
SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) {
if (!circ->marked_for_close &&
circ->state == CIRCUIT_STATE_OPEN &&
(circ->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO ||
circ->purpose == CIRCUIT_PURPOSE_S_INTRO)) {
origin_circuit_t *oc = TO_ORIGIN_CIRCUIT(circ);