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

[dgoulet at torproject.org]

commit e778f7065fd65c51f1ad4bb46c596c2b9d2cf1e4
Merge: 8efb9c29e9 fd3678fa60
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 27 10:01:49 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/bug40375                      |  5 +++++
 src/feature/control/control_getinfo.c | 32 +++++++++++++++-----------------
 src/feature/dirclient/dirclient.c     | 21 +++++++++++++--------
 3 files changed, 33 insertions(+), 25 deletions(-)