[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug17638-ipv6-ersatz-socketpair'

[nickm at torproject.org]

commit 5f4cd245ec4a944339630c5b3a3368c837d1535d
Merge: 118bdc3 f19d6b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 19 10:48:40 2015 -0500

    Merge remote-tracking branch 'teor/bug17638-ipv6-ersatz-socketpair'

 changes/bug17638-ipv6-ersatz-socketpair |    5 ++
 src/common/compat.c                     |   88 ++++++++++++++++++++++---------
 src/test/test_util.c                    |   17 +++---
 3 files changed, 77 insertions(+), 33 deletions(-)