commit 7185860ef583beac1a85c46d1378c53dbaca1a57 Merge: ede9554b5f 27ee12836d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 19 13:20:43 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)