commit c54f4b81da5635b282fc45c6301c490663113434 Merge: 08c0ef61d8 633b68bfe2 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 21 14:58:31 2021 -0500

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

changes/ticket40245 | 4 ++++ src/feature/dirauth/dirvote.c | 30 +++++++++++++++++++++++++----- src/feature/dirauth/dirvote.h | 3 +++ src/feature/dirauth/process_descs.c | 8 ++++++-- src/feature/dirauth/reachability.c | 14 +++++++++----- src/feature/dircache/dircache.c | 12 +++++++++++- src/feature/dirclient/dirclient.c | 8 ++++---- src/test/test_dir_handle_get.c | 18 +++++++++--------- 8 files changed, 71 insertions(+), 26 deletions(-)