From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Mar 2013 19:11:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug7768' into maint-0.2.4
X-Git-Tag: tor-0.2.5.1-alpha~251^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60d14421363bdbeee337ba69b21640058a26a6bd;p=thirdparty%2Ftor.git

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

60d14421363bdbeee337ba69b21640058a26a6bd
diff --cc src/tools/tor-fw-helper/tor-fw-helper.c
index adeb63b736,488fe67419..bb6e70aaa3
--- a/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