commit 27ee12836d67a0cfa123a2f2fad378c93848519a Merge: e3a5482681 691c717187 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 19 13:20:31 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/261' into maint-0.4.5 changes/ticket40243 | 4 ++++ src/feature/dirauth/dirvote.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)