commit f0678b37ed55b34c513d719387bdcea6c8ee958d Merge: fb2b8339cb 31fa3cc1a0 Author: David Goulet dgoulet@torproject.org Date: Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

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