Merge branch 'maint-0.3.5' into maint-0.4.4
commit5ec579610ace4d3e4f0a6432b26e1e968beccf36
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Mar 2021 13:01:59 +0000 (15 09:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Mar 2021 13:01:59 +0000 (15 09:01 -0400)
tree46e9096a74a98dae6c67410eac4a5e34f4192bc3
parent2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e
parentf078aab71ef56e1942caec5f27e0f336f2a7c7d1
Merge branch 'maint-0.3.5' into maint-0.4.4
src/feature/dirauth/dirvote.c