[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6

[dgoulet at torproject.org]

commit 5b18f824666571c2a84f1e4e19718fb9ad782d74
Merge: 10cd73761d 7d9d769123
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 18 13:12:35 2022 -0500

    Merge branch 'maint-0.4.6' into release-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(-)