From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 1 Oct 2012 15:01:18 +0000 (-0400)
Subject: The --version option should imply --quiet.
X-Git-Tag: tor-0.2.4.4-alpha~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a80d8e09d3b5f393f2dc83148ef66c6e1d7f4015;p=thirdparty%2Ftor.git

The --version option should imply --quiet.

Patch from 'maker'.
---

diff --git a/changes/ticket6997 b/changes/ticket6997
new file mode 100644
index 0000000000..0a33b37552
--- /dev/null
+++ b/changes/ticket6997
@@ -0,0 +1,2 @@
+  o Minor bugfixes:
+    - Command-line option "--version" implies "--quiet". Closes ticket #6997.
diff --git a/src/or/main.c b/src/or/main.c
index 635dcb4bd5..74bb696725 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2293,6 +2293,9 @@ tor_init(int argc, char *argv[])
       quiet = 1;
     if (!strcmp(argv[i], "--quiet"))
       quiet = 2;
+    /* --version implies --quiet */
+    if (!strcmp(argv[i], "--version"))
+      quiet = 2;
   }
  /* give it somewhere to log to initially */
   switch (quiet) {