Merge branch 'maint-0.4.5'
commit9be33755ef9b413a665be03e0bd5f57881bc144c
authorDavid Goulet <dgoulet@torproject.org>
Thu, 21 Jan 2021 19:58:39 +0000 (21 14:58 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Thu, 21 Jan 2021 19:58:39 +0000 (21 14:58 -0500)
tree59d427cf424ec483830639ca81d42c3b27a9a02a
parentb2536c97f941ad2e4e068c43f8ce18469c63585c
parentc54f4b81da5635b282fc45c6301c490663113434
Merge branch 'maint-0.4.5'
src/feature/dirauth/dirvote.c
src/feature/dirauth/dirvote.h