Merge branch 'maint-0.4.4' into maint-0.4.5
commit61731e35507fea1c932f80f0849dcae924113df1
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)
tree0f3221849fffa65c107383c7fbbe9d9b532b427d
parenta6533af9e8d90fda13180064e98b49ac3c3cdf86
parent5ec579610ace4d3e4f0a6432b26e1e968beccf36
Merge branch 'maint-0.4.4' into maint-0.4.5
src/feature/dirauth/dirvote.c