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

[nickm at torproject.org]

commit 694e3c57fd1af2cdaa4650d69c50f4108a8612f6
Merge: 380ae2b74 c59b572e9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 9 09:38:22 2019 -0500

    Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5

 changes/bug28995         | 5 +++++
 src/lib/net/socketpair.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)