[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug7768' into maint-0.2.4

[nickm@xxxxxxxxxxxxxx]

commit 60d14421363bdbeee337ba69b21640058a26a6bd
Merge: 8d29866 6fe4e24
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Mar 19 15:11:47 2013 -0400

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

 changes/bug7768                         |    3 +++
 doc/tor-fw-helper.1.txt                 |   14 +++++++-------
 src/tools/tor-fw-helper/tor-fw-helper.c |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --cc src/tools/tor-fw-helper/tor-fw-helper.c
index adeb63b,488fe67..bb6e70a
--- 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits