commit dd119b277b66c1a7209d4a345fd43878296a532e Merge: 4f5a116618 511822529a Author: George Kadianakis desnacked@riseup.net Date: Tue Nov 3 16:06:12 2020 +0200

Merge remote-tracking branch 'tor-gitlab/mr/185' into master

changes/ticket32178 | 3 +++ src/feature/control/control_events.c | 26 ++++++++++++++++++++++---- src/feature/control/control_events.h | 2 ++ src/test/test_controller_events.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-)