Merge branch 'maint-0.3.5' into maint-0.4.5
commit47adba879ca215ef1cd5abae93a32e17063eccb2
authorDavid Goulet <dgoulet@torproject.org>
Fri, 5 Nov 2021 14:35:08 +0000 (5 10:35 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 5 Nov 2021 14:35:08 +0000 (5 10:35 -0400)
tree6f731289d34f97dfef8270311d453f404ce7776b
parent40e21060312ebcd0ff5ab4db5fc22f93bed474de
parent439e17180c362962abfdf2301dddbdaa323df24a
Merge branch 'maint-0.3.5' into maint-0.4.5
src/core/or/protover.c
src/core/or/protover.h
src/feature/dirauth/dirvote.c