[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[dgoulet at torproject.org]

commit a4510603f742a7db0f5e8f359920ad4001a9db07
Merge: 66e7ddb551 7d9d769123
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 18 13:12:35 2022 -0500

    Merge branch '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(-)