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

[nickm at torproject.org]

commit 698629f5a9eca21e0251f5d249f176a00aebf871
Merge: 8a0b74148 89c4a3a0b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 16 17:29:50 2018 -0400

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

 changes/bug27928               |  4 ++++
 src/core/mainloop/connection.c | 10 ++++++++++
 2 files changed, 14 insertions(+)