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

[nickm at torproject.org]

commit 8136ebba26c08ef54d65ec46dcd4796bb8429b33
Merge: 84fc0c579 70bcff601
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 18 08:07:56 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

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