commit 5ec579610ace4d3e4f0a6432b26e1e968beccf36 Merge: 2eb900f7e2 f078aab71e Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 09:01:59 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.4

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