commit e085591c98884296419f6b7d910d06bff7684de7 Merge: 37303de391 439e17180c Author: David Goulet dgoulet@torproject.org Date: Fri Nov 5 10:33:53 2021 -0400
Merge branch 'maint-0.3.5' into release-0.3.5
src/core/or/protover.c | 113 +++++++++++++++++++++++++++++++++++++++++- src/core/or/protover.h | 4 ++ src/feature/dirauth/dirvote.c | 13 ++--- 3 files changed, 120 insertions(+), 10 deletions(-)