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

[dgoulet at torproject.org]

commit 14bd196eb866809159712e810937cec6749f4733
Merge: fe32ac926e 088a74aaab
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Feb 12 13:54:18 2021 +0200

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40221_045       | 6 ++++++
 src/core/or/protover.c        | 2 +-
 src/rust/protover/protover.rs | 4 ++--
 src/test/test_protover.c      | 3 ---
 4 files changed, 9 insertions(+), 6 deletions(-)