The --version option should imply --quiet.

Patch from 'maker'.

diff --git a/changes/ticket6997 b/changes/ticket6997
new file mode 100644 (file)
index 0000000..0a33b37
--- /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 635dcb4bd56550298cef5e068438292a5eee8768..74bb6967259d942c405c1594f025796d3d69f6f9 100644 (file)
--- 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) {