commit c72526f16870226379c64fbed9e7b25351723c53 Merge: 7502e5467 9ae8d663e Author: teor teor@torproject.org Date: Wed Mar 27 09:36:55 2019 +1000

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