[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0

[teor at torproject.org]

commit 9ae8d663ea9006c9e20f48868d96877984652e16
Merge: 06951cb3f 5d2f5e482
Author: teor <teor at torproject.org>
Date:   Wed Mar 27 09:36:26 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/836' into 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(-)