Merge branch 'maint-0.3.5' into maint-0.4.5
commitaac5731f86399a3ac37720f9d0c4cffacd8eb38a
authorDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:12:13 +0000 (18 13:12 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:12:13 +0000 (18 13:12 -0500)
treeb194d62a8784efc16541c02de4fc72cd1f629888
parent882fd1f0d45656e0535e70b5e115281b39ac6307
parent72041c63064b461e2eb9102f12c4fe217e9066dd
Merge branch 'maint-0.3.5' into maint-0.4.5
src/core/or/protover.c
src/test/test_protover.c