From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 26 Aug 2013 18:32:56 +0000 (-0400)
Subject: Add '--digests' to "that which implies --hush."
X-Git-Tag: tor-0.2.5.1-alpha~38^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6cad4db7063885aee2eceea7c481bc7583e1a4f;p=thirdparty%2Ftor.git

Add '--digests' to "that which implies --hush."

And have these various commandline options imply "hush", not "quiet",
since we like to see warnings.
---

diff --git a/src/or/main.c b/src/or/main.c
index 22519f04aa..598d099d20 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -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);