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

[nickm at torproject.org]

commit 3af943dcd19d5bdb8fba059e773b6795d4bf89f5
Merge: d8409ccb7 389ee834b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 7 08:56:35 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0

 changes/bug29144               | 5 +++++
 src/core/mainloop/connection.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)