[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[dgoulet at torproject.org]

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

    Merge branch 'maint-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(-)