Browse Source

Make --hash-password imply --hush to prevent unnecessary noise.

cypherpunks 9 years ago
parent
commit
59e753a4a6
2 changed files with 5 additions and 1 deletions
  1. 3 0
      changes/ticket15542
  2. 2 1
      src/or/main.c

+ 3 - 0
changes/ticket15542

@@ -0,0 +1,3 @@
+  o Minor features (command-line interface):
+    - Make --hash-password imply --hush to prevent unnecessary noise. Closes
+      ticket 15542.

+ 2 - 1
src/or/main.c

@@ -2484,10 +2484,11 @@ tor_init(int argc, char *argv[])
       if (!strcmp(cl->key, "--quiet") ||
           !strcmp(cl->key, "--dump-config"))
         quiet = 2;
-      /* --version, --digests, and --help imply --hush */
+      /* The following options imply --hush */
       if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
           !strcmp(cl->key, "--list-torrc-options") ||
           !strcmp(cl->key, "--library-versions") ||
+          !strcmp(cl->key, "--hash-password") ||
           !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) {
         if (quiet < 1)
           quiet = 1;