commit 0343ec056e14a655fe9003024d2cd5e1fc806d51 Merge: 3fe253e6e1 ad7ffa5240 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 08:26:04 2020 -0400

Merge branch 'maint-0.3.5' into release-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(-)