commit 701a1936fae48c6887cadd90dbe50ae84a00a29f Merge: a49373844c ad7ffa5240 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 7 08:26:04 2020 -0400 Merge branch 'maint-0.3.5' into maint-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(-)