[tor-commits] [tor/maint-0.4.3] Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5

commit ad7ffa5240c4b3a9b675a12f0705d9cbe0bc8beb Merge: 98e14720b5 ceb6585a4b Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:25:55 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5

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