commit 0d04a9a82945680788cff446215b98fd68b9f055 Merge: 2b1c08567d f078aab71e Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 09:01:59 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug40316 | 5 +++++ src/feature/dirauth/dirvote.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)