Merge branch 'maint-0.4.5' into maint-0.4.6
commit7d9d769123c33a88b6f441e19faf56c2c1e5931c
authorDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:12:35 +0000 (18 13:12 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:12:35 +0000 (18 13:12 -0500)
tree666d715acee0a2d2b19ea87ddbc0f260ff32c9c6
parent413e0c7575c27c6a8e66ed19d088be636a70ffbd
parentaac5731f86399a3ac37720f9d0c4cffacd8eb38a
Merge branch 'maint-0.4.5' into maint-0.4.6
src/core/or/protover.c
src/test/test_protover.c