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

[dgoulet at torproject.org]

commit 7aa75d0738d78ae122eb601f8c96da5f6332c2b1
Merge: 13fd8f362f 80c404c4b7
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri May 7 08:49:34 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40373           |  3 +++
 src/core/or/connection_edge.c | 10 ++++++++++
 2 files changed, 13 insertions(+)