commit d3bcbccab9d50fd0dafc682f7ee63902ea344be7 Merge: ceddc39c5 523231516 Author: David Goulet dgoulet@torproject.org Date: Tue Jun 23 08:52:33 2020 -0400

Merge branch 'maint-0.4.4'

changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 12 ++++++------ src/test/test_protover.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)