[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/339'

[nickm at torproject.org]

commit 37b16d7e1977647d297c165afa0435536a474264
Merge: f1c673fa54 6de09642f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 24 12:23:30 2021 -0400

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

 changes/ticket40271           |  5 +++++
 src/core/or/connection_edge.c | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)