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

[dgoulet at torproject.org]

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

    Merge branch 'maint-0.4.6'

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