commit b4237f8288f3a94936cd519c81be368ad58f96f2 Merge: ba278b887c a7fe37f1fa Author: David Goulet <dgoulet@torproject.org> Date: Fri Nov 5 10:44:10 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 src/core/or/protover.c | 105 +++++++++++++++++++++++++++++++++++++++++- src/core/or/protover.h | 4 ++ src/feature/dirauth/dirvote.c | 12 ++--- src/feature/dirauth/dirvote.h | 58 ----------------------- src/test/test_protover.c | 8 ++-- 5 files changed, 117 insertions(+), 70 deletions(-)