[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/406'

[asn at torproject.org]

commit e79d73de9b2f94bebc87166ed86d00b4b3295010
Merge: 8949317ecc 301ffb71a6
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jul 7 13:02:11 2021 +0300

    Merge remote-tracking branch 'tor-gitlab/mr/406'

 changes/ticket40421           | 3 +++
 src/core/or/connection_edge.c | 4 ++++
 2 files changed, 7 insertions(+)