commit 7d9d769123c33a88b6f441e19faf56c2c1e5931c Merge: 413e0c7575 aac5731f86 Author: David Goulet dgoulet@torproject.org Date: Tue Jan 18 13:12:35 2022 -0500

Merge branch 'maint-0.4.5' into maint-0.4.6

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