commit 18d2c7c5d7eb0441d891fb7642fbbabde6c53cf2 Merge: 4c22050de1 ceb6585a4b Author: George Kadianakis desnacked@riseup.net Date: Mon Aug 3 16:48:52 2020 +0300

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

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(-)