[tor-commits] [tor/master] Make --hash-password imply --hush to prevent unnecessary noise.

[nickm at torproject.org]

commit 59e753a4a6751a38c9caa0731c883cd1d8ac07c2
Author: cypherpunks <cypherpunks at torproject.org>
Date:   Fri Apr 10 16:10:44 2015 +0200

    Make --hash-password imply --hush to prevent unnecessary noise.
---
 changes/ticket15542 |    3 +++
 src/or/main.c       |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/ticket15542 b/changes/ticket15542
new file mode 100644
index 0000000..fcf293e
--- /dev/null
+++ b/changes/ticket15542
@@ -0,0 +1,3 @@
+  o Minor features (command-line interface):
+    - Make --hash-password imply --hush to prevent unnecessary noise. Closes
+      ticket 15542.
diff --git a/src/or/main.c b/src/or/main.c
index a3da148..07d5ba8 100644
--- a/src/or/main.c
+++ b/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;