[tor-commits] [tor/main] Merge branch 'tor-gitlab/mr/392' into maint-0.4.6

commit fd3678fa60b3ba66fa414f86ce962f380ca6462e Merge: bab2b29f89 d12b16614d Author: David Goulet dgoulet@torproject.org Date: Thu May 27 10:01:44 2021 -0400

Merge branch 'tor-gitlab/mr/392' into 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(-)