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

[dgoulet at torproject.org]

commit fd640bbeae9cd36b3b202f3d64474e68c9fd38cf
Merge: fb7c832597 82b7939d19
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Oct 6 13:25:08 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 changes/ticket40474           |  5 +++++
 src/core/or/connection_edge.c | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)