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

[dgoulet at torproject.org]

commit ac623fa2ac69d00d5e19c1440242bdaf7914c8ca
Merge: 0a02fd7445 f0d1240a07
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Oct 6 13:24:22 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40474           |  5 +++++
 src/core/or/connection_edge.c | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)