commit 0530e80e5de325ba9d36a13c924950ccd49dbf72 Merge: d04f21b a65212e Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 30 17:51:01 2011 -0500

Merge remote-tracking branch 'sjmurdoch/bug1983-port-tor-fw-helper-to-windows'

configure.in | 7 +++++-- src/tools/tor-fw-helper/Makefile.am | 2 +- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 6 ++++-- 3 files changed, 10 insertions(+), 5 deletions(-)