]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug29015'
authorNick Mathewson <nickm@torproject.org>
Mon, 14 Jan 2019 18:59:07 +0000 (13:59 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 14 Jan 2019 18:59:07 +0000 (13:59 -0500)
1  2 
src/lib/net/socketpair.c

Simple merge