commit c2029e1da999fef10452f28a55fd6a44da670da3 Merge: 6470aed5ae aac5731f86 Author: David Goulet dgoulet@torproject.org Date: Tue Jan 18 13:12:35 2022 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/ticket40509 | 4 ++++ src/core/or/protover.c | 4 ++-- src/test/test_protover.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)