aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/ticket69972
-rw-r--r--src/or/main.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket6997 b/changes/ticket6997
new file mode 100644
index 000000000..0a33b3755
--- /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 635dcb4bd..74bb69672 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) {