commit 523231516817a7037d150d583f3b83304c2686ec Merge: 3d0e1c42d b67f7d722 Author: David Goulet dgoulet@torproject.org Date: Tue Jun 23 08:52:16 2020 -0400

Merge branch 'tor-github/pr/1937' into 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(-)