[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

[nickm at torproject.org]

commit 0e2e517019bf3c8779c9a3f81e453277a372c9f3
Merge: faac186075 884cad3edf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 08:35:18 2020 -0400

    Merge branch 'maint-0.4.3' into maint-0.4.4

 changes/bug34400                  | 5 +++++
 src/feature/control/control_cmd.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)