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

diff --cc src/tools/tor-fw-helper/tor-fw-helper.c
index adeb63b7364f37c2307b80a8d6037362337b6573,488fe67419bb1771a8f6497837f0264f1ada5b3d..bb6e70aaa3cdddc2f036fd1b3ae3a14cbd5bcc73
--- 1/src/tools/tor-fw-helper/tor-fw-helper.c
--- 2/src/tools/tor-fw-helper/tor-fw-helper.c
+++ b/src/tools/tor-fw-helper/tor-fw-helper.c
@@@ -97,10 -97,10 +97,10 @@@ 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");
 +          " [-p|--forward-port ([<external port>]:<internal port>)]\n");
  }
  
  /** Log commandline options to a hardcoded file <b>tor-fw-helper.log</b> in the