[tor-commits] [tor/master] Merge branch 'bug31772_041' into maint-0.4.1

[nickm at torproject.org]

commit 70bcff6010f933c7dbce5d797ea354c6475e1f94
Merge: 5f00c03ed 25af8ada3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 18 08:07:50 2019 -0400

    Merge branch 'bug31772_041' into maint-0.4.1

 changes/ticket31772               | 4 ++++
 src/feature/control/control_cmd.c | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)