commit b0af4ddc7c2fe80a79e41e31b7050d949561e044 Merge: deb445e94b 27ee12836d Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 19 13:20:43 2021 -0500

Merge branch 'maint-0.4.5'

changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)