diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-31 15:20:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-31 15:20:45 -0400 |
| commit | 59a78187cdf9c48f492e92c3a33ce17b75f7472d (patch) | |
| tree | 34f64cf55e7378d747ef4c5fe76bdc791bbfa3ce | |
| parent | cac495f0ffdb9d6261c0329c41c4e1ceee127cf7 (diff) | |
| parent | 24b7b922ae9adc814890feae661ad64f474307f3 (diff) | |
| download | tor-59a78187cdf9c48f492e92c3a33ce17b75f7472d.tar.gz tor-59a78187cdf9c48f492e92c3a33ce17b75f7472d.zip | |
Merge branch 'maint-0.2.9'
| -rw-r--r-- | changes/bug20401 | 4 | ||||
| -rw-r--r-- | src/or/cpuworker.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug20401 b/changes/bug20401 new file mode 100644 index 0000000000..85ab3c7322 --- /dev/null +++ b/changes/bug20401 @@ -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. + diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 26bc54b55c..fd6de6ea7c 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -168,6 +168,7 @@ update_state_threadfn(void *state_, void *work_) server_onion_keys_free(state->onion_keys); state->onion_keys = update->onion_keys; update->onion_keys = NULL; + worker_state_free(update); ++state->generation; return WQ_RPL_REPLY; } |