Merge branch 'maint-0.4.5' into maint-0.4.6
commit77b265f96ee65871ae7ed3f54642878116c65ff4
authorDavid Goulet <dgoulet@torproject.org>
Fri, 5 Nov 2021 14:44:10 +0000 (5 10:44 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 5 Nov 2021 14:44:10 +0000 (5 10:44 -0400)
tree10b6fa4621ecf04d23fecd169c254f24623bd88f
parentfb6bba1e42c465ed5e93b1a194f259e4a1be9131
parenta7fe37f1fa7821d0bdbeabe480df8aba7dc1fded
Merge branch 'maint-0.4.5' into maint-0.4.6
src/core/or/protover.c
src/core/or/protover.h
src/feature/dirauth/dirvote.c
src/feature/dirauth/dirvote.h
src/test/test_protover.c