commit a53c949dcf2816f6878209788c8768b7ca35dc35 Merge: f0d1240a07 cac612af42 Author: David Goulet dgoulet@torproject.org Date: Wed Oct 6 15:35:30 2021 -0400

Merge branch 'tor-gitlab/mr/420' into maint-0.4.5

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