commit 35ae8d4e8f497cfff40334c8c5fbc19746a15fb7 Merge: fd2f79cacf 26cfac1880 Author: David Goulet dgoulet@torproject.org Date: Tue Oct 27 10:20:05 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

changes/ticket40162 | 7 ++++++ src/feature/dirauth/dirvote.h | 52 +++++++++++++++++++++++++++++++++---------- 2 files changed, 47 insertions(+), 12 deletions(-)