[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/384'

[nickm at torproject.org]

commit da86a70bd8ea6c468ac7e27a53245bbeb9d28b58
Merge: 7409aa58d fb1d37f34
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 09:24:48 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/384'

 changes/bug27808               | 4 ++++
 src/core/mainloop/connection.c | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)