commit 3268403ba1fac9366575f4511b9f46d2b7738039 Merge: cfeb063f24 61731e3550 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 15 09:01:59 2021 -0400

Merge branch 'maint-0.4.5'

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