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

[nickm at torproject.org]

commit d6d3e829dd20b78e2b80e52f0e3865a1002e653b
Merge: 7225cfc58 70bcff601
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 18 08:07:56 2019 -0400

    Merge branch 'maint-0.4.1'

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