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

diff --git a/changes/ticket15542 b/changes/ticket15542
new file mode 100644 (file)
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 a3da1480230ff29a0f263d9c9cfd9b8f388d6a65..07d5ba883f76ee557df1535bf7c99d61a0840d80 100644 (file)
--- 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;