commit 2d013bbe5cccaccf9ace0beec5a987fb80e850ad Merge: a1d534137 8162859ef Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 22 08:36:32 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1417' changes/31147 | 3 +++ src/feature/control/control_events.c | 5 ++++- src/lib/buf/buffers.c | 1 + src/lib/process/process.c | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)