commit e9684405acf5d3bbfa3c2d4f70332cef3c66d553 Merge: d2d7cab 4edc57c Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 6 10:12:28 2012 -0400 Merge remote-tracking branch 'asn/bug4567_rebased' changes/bug4567 | 3 + changes/bug4567_2 | 4 + doc/tor-fw-helper.1.txt | 14 +- src/common/util.c | 272 ++++++++++++++++-- src/common/util.h | 13 +- src/or/circuitbuild.h | 4 + src/or/config.c | 37 +++ src/or/config.h | 2 + src/or/main.c | 14 +- src/or/transports.c | 113 +++----- src/or/transports.h | 2 + src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 58 ++-- src/tools/tor-fw-helper/tor-fw-helper-natpmp.h | 4 +- src/tools/tor-fw-helper/tor-fw-helper-upnp.c | 44 ++-- src/tools/tor-fw-helper/tor-fw-helper-upnp.h | 3 +- src/tools/tor-fw-helper/tor-fw-helper.c | 367 +++++++++++++++--------- src/tools/tor-fw-helper/tor-fw-helper.h | 20 +- 17 files changed, 656 insertions(+), 318 deletions(-)