]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Add '--digests' to "that which implies --hush."
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Aug 2013 18:32:56 +0000 (14:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Sep 2013 16:36:40 +0000 (12:36 -0400)
And have these various commandline options imply "hush", not "quiet",
since we like to see warnings.

src/or/main.c

index 22519f04aaa051f8b393aafe6b1696b279c42b04..598d099d200df0ac4cab95f001838b9be89bb396 100644 (file)
@@ -2345,10 +2345,10 @@ tor_init(int argc, char *argv[])
         quiet = 1;
       if (!strcmp(cl->key, "--quiet"))
         quiet = 2;
-      /* --version and --help imply --quiet */
-      if (!strcmp(cl->key, "--version") ||
+      /* --version, --digests, and --help imply --quiet */
+      if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
           !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help"))
-        quiet = 2;
+        quiet = 1;
     }
     config_free_lines(opts);
     config_free_lines(cmdline_opts);