commit 5668287fe74122c61eaa2178a97737d671109655 Merge: 64b8ee3f9 a692b87f8 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 13:53:39 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

changes/bug33104 | 4 ++++ src/feature/control/control.c | 4 ++++ src/feature/control/control_events.c | 32 +++++++++-------------------- src/test/test_controller_events.c | 39 ++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 22 deletions(-)