From: rl1987 <rl1987@sdf.lonestar.org>
Date: Sun, 30 Aug 2015 18:57:24 +0000 (+0300)
Subject: Remove -F from tor-resolve(1) usage message.
X-Git-Tag: tor-0.2.7.3-rc~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54565ca80447d2fcab5fd78b02fcc28f1c95d52f;p=thirdparty%2Ftor.git

Remove -F from tor-resolve(1) usage message.
---

diff --git a/changes/bug16913 b/changes/bug16913
new file mode 100644
index 0000000000..464140b538
--- /dev/null
+++ b/changes/bug16913
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix an usage message of tor-resolve(1) so that it no longer lists
+      the removed -F option. Resolves ticket #16913; bugfix on Tor
+      0.2.2.28-beta.
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 08bce15e69..29f85c4d17 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -327,7 +327,7 @@ do_resolve(const char *hostname, uint32_t sockshost, uint16_t socksport,
 static void
 usage(void)
 {
-  puts("Syntax: tor-resolve [-4] [-5] [-v] [-x] [-F] [-p port] "
+  puts("Syntax: tor-resolve [-4] [-5] [-v] [-x] [-p port] "
        "hostname [sockshost[:socksport]]");
   exit(1);
 }