commit 270398fa313bad3ff8f568f3290045572a9ca64a Merge: 3f73ab3f0d 2c00ad36cd Author: David Goulet dgoulet@torproject.org Date: Fri Jun 18 14:29:15 2021 -0400

Merge branch 'maint-0.4.6'

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