commit 99947c3ce0a34f8a2dd8c201f8ef348666da403a Merge: cef910642 671c34d9b Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 14 13:59:07 2019 -0500

Merge remote-tracking branch 'teor/bug29015'

src/lib/net/socket.c | 4 +++- src/lib/net/socketpair.c | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-)