Merge remote-tracking branch 'public/bug7768' into maint-0.2.4

changes/bug7768

@@ -0,0 +1,3 @@
+  o Documentation fixes:
+    - Update tor-fw-helper.1.txt and tor-fw-helper.c to make option
+      names match. Fixes bug 7768.

doc/tor-fw-helper.1.txt

@@ -14,9 +14,8 @@ tor-fw-helper - Manage upstream firewall/NAT devices
 
 SYNOPSIS
 --------
-**tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip]
- -i|--internal-or-port __TCP port__ [-e|--external-or-port _TCP port_]
- [-d|--internal-dir-port _TCP port_] [-p|--external-dir-port _TCP port_]
+**tor-fw-helper** [-h|--help] [-T|--test-commandline] [-v|--verbose] [-g|--fetch-public-ip]
+ [-p __external port__:__internal_port__]
 
 DESCRIPTION
 -----------
@@ -31,18 +30,19 @@ OPTIONS
 **-h** or **--help**::
     Display help text and exit.
 
-**-v**::
+**-v** or **--verbose**::
     Display verbose output.
 
-**-T** or **--test**::
+**-T** or **--test-commandline**::
     Display test information and print the test information in
     tor-fw-helper.log
 
 **-g** or **--fetch-public-ip**::
     Fetch the the public ip address for each supported NAT helper method.
 
-**-p** or **--forward-port** __external_port__:__internal_port__::
-    Forward external_port to internal_port.
+**-p** or **--port** __external_port__:__internal_port__::
+    Forward external_port to internal_port.  This option can appear
+    more than once.
 
 BUGS
 ----

src/tools/tor-fw-helper/tor-fw-helper.c

@@ -97,7 +97,7 @@ usage(void)
 {
   fprintf(stderr, "tor-fw-helper usage:\n"
           " [-h|--help]\n"
-          " [-T|--Test]\n"
+          " [-T|--test-commandline]\n"
           " [-v|--verbose]\n"
           " [-g|--fetch-public-ip]\n"
           " [-p|--forward-port ([<external port>]:<internal port>)]\n");