[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13338'
nickm at torproject.org
nickm at torproject.org
Tue Aug 4 18:01:02 UTC 2015
commit 9e07dfa34bdcd9a8ee1e5b71d871754c17fcba29
Merge: b3ea3c8 d2cb923
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Aug 4 14:00:58 2015 -0400
Merge remote-tracking branch 'public/bug13338'
changes/ticket13338 | 6 +
configure.ac | 77 ----
src/tools/include.am | 4 +-
src/tools/tor-fw-helper/README | 10 +
src/tools/tor-fw-helper/include.am | 36 --
src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 240 ------------
src/tools/tor-fw-helper/tor-fw-helper-natpmp.h | 47 ---
src/tools/tor-fw-helper/tor-fw-helper-upnp.c | 193 ---------
src/tools/tor-fw-helper/tor-fw-helper-upnp.h | 44 ---
src/tools/tor-fw-helper/tor-fw-helper.c | 501 ------------------------
src/tools/tor-fw-helper/tor-fw-helper.h | 59 ---
11 files changed, 17 insertions(+), 1200 deletions(-)
More information about the tor-commits
mailing list