commit 66ddef94a91a0543aee2b92c51eac6d9f4779470 Merge: b5d136088c 77b265f96e Author: David Goulet dgoulet@torproject.org Date: Fri Nov 5 10:44:10 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

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(-)