commit 4f585b9ee21aa45ec696012c9ebb63b25aba50a4 Merge: b51e21c d1dd999 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 30 15:51:45 2011 -0400 Merge remote-tracking branch 'sjmurdoch/bug2046' configure.in | 4 +- src/common/util.c | 619 +++++++++++++++++++++++--- src/common/util.h | 43 ++- src/test/test-child.c | 22 + src/test/test_util.c | 268 ++++++++++- src/tools/tor-fw-helper/Makefile.am | 2 +- src/tools/tor-fw-helper/tor-fw-helper-upnp.c | 3 + src/tools/tor-fw-helper/tor-fw-helper.c | 35 ++- 8 files changed, 907 insertions(+), 89 deletions(-)