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

Merge branch 'maint-0.2.9'

Browse Source
This commit is contained in:
Nick Mathewson 2016-10-31 15:20:45 -04:00
commit 59a78187cd
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug20401 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (relay):
- Avoid a small memory leak when informing worker threads about rotated
onion keys. Fixes bug 20401; bugfix on 0.2.6.3-alpha.

1
src/or/cpuworker.c
View File

@ -168,6 +168,7 @@ update_state_threadfn(void *state_, void *work_)
server_onion_keys_free(state->onion_keys); server_onion_keys_free(state->onion_keys);
state->onion_keys = update->onion_keys; state->onion_keys = update->onion_keys;
update->onion_keys = NULL; update->onion_keys = NULL;
worker_state_free(update);
++state->generation; ++state->generation;
return WQ_RPL_REPLY; return WQ_RPL_REPLY;
} }