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

[dgoulet at torproject.org]

commit 3abb9180cb3ff91153b34cb7c5db80421b2b9751
Merge: e18bf39e66 2c00ad36cd
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Jun 18 14:29:15 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/ticket40410               | 4 ++++
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)