diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-30 16:22:39 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-30 16:22:39 -0400 |
commit | 495e630a498fc4121a9852cad100af41e708cd4c (patch) | |
tree | 7c5209ab9c5a6544b47ee081190262a86891c793 /changes | |
parent | d39e46c26d6992dcd019fa159981c057c3d24716 (diff) | |
parent | 0e9d969bb2bb4bb9a5f7db1db824c729d7142cbc (diff) | |
download | tor-495e630a498fc4121a9852cad100af41e708cd4c.tar.gz tor-495e630a498fc4121a9852cad100af41e708cd4c.zip |
Merge branch 'tor-fw-squashed2'
Conflicts:
src/common/util.c
Diffstat (limited to 'changes')
-rw-r--r-- | changes/tor-fw-helper | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/changes/tor-fw-helper b/changes/tor-fw-helper new file mode 100644 index 0000000000..f87d828b8f --- /dev/null +++ b/changes/tor-fw-helper @@ -0,0 +1,14 @@ + o Major features: + - Tor now has the ability to wrangle NAT devices like a good network cowbot + with the tor-fw-helper tool. The tor-fw-helper tool supports Apple's + NAT-PMP protocol and the UPnP standard for TCP port mapping. This + optional tool may be enabled at compile time by configuring with + '--enable-upnp' or '--enable-natpmp' or with both. This tool may be + called by hand or by Tor. By configuring the PortForwarding option, Tor + will launch the helper on a regular basis to ensure that the NAT mapping + is regularly updated. Additionally, a user may also specify an + alternative helper by using the PortForwardingHelper option. The helper + may be specified by name or with the full path to the helper. The default + helper is named 'tor-fw-helper' and any alternative helper must take the + tor-fw-helper-spec.txt into account. + |