commit 53b08a1158b2f4a9c69c2ea908c7c2b73afb737c Merge: fd640bbeae 474c85a98d Author: David Goulet dgoulet@torproject.org Date: Wed Oct 6 15:35:43 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

changes/ticket40434 | 6 ++++++ src/feature/dirclient/dirclient.c | 17 ++++++++++++++++- src/feature/dircommon/directory.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletion(-)