[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[dgoulet at torproject.org]

commit 1c77deca4f8e8027eaf130b6454af758e4d9ccc4
Merge: c363e2017f 77b265f96e
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Nov 5 10:44:10 2021 -0400

    Merge branch 'maint-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(-)