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

[nickm at torproject.org]

commit bef47600552c78ee0ad849cb8b4a98039234ae63
Merge: 225d255fdc 701a1936fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 7 08:26:04 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/ticket33747            | 7 +++++++
 src/core/mainloop/connection.c | 7 ++++++-
 src/core/or/connection_st.h    | 3 +++
 src/feature/relay/ext_orport.c | 4 ++++
 4 files changed, 20 insertions(+), 1 deletion(-)