[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1574'

commit 96e620caaf11909bce704f3c55187a139595a8e9 Merge: 68a00c495 41a393012 Author: teor teor@torproject.org Date: Sun Dec 1 17:53:06 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1574'

changes/bug31531 | 4 ++++ src/app/config/config.c | 8 +------- src/feature/control/control_events.c | 29 +++++++++++++---------------- src/feature/control/control_events.h | 7 ++++--- 4 files changed, 22 insertions(+), 26 deletions(-)