commit 571a7d59176fa12230edd9e97eba975c7bfc8386 Merge: fa9e0963c 9ae8d663e Author: teor teor@torproject.org Date: Wed Mar 27 09:36:50 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug28925 | 4 ++++ src/core/mainloop/connection.c | 16 +++++++++++----- src/core/mainloop/connection.h | 2 +- src/core/or/connection_or.c | 16 +++++++++++++--- src/core/or/or_connection_st.h | 2 ++ 5 files changed, 31 insertions(+), 9 deletions(-)