diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2015-04-10 16:10:44 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-15 09:39:41 -0400 |
| commit | 59e753a4a6751a38c9caa0731c883cd1d8ac07c2 (patch) | |
| tree | 6ad047cf10b1d591d5a7b7c49221f041f413cd25 /src/or/main.c | |
| parent | e891deb02120c3756ccfb87171e36d271c3d7077 (diff) | |
| download | tor-59e753a4a6751a38c9caa0731c883cd1d8ac07c2.tar.gz tor-59e753a4a6751a38c9caa0731c883cd1d8ac07c2.zip | |
Make --hash-password imply --hush to prevent unnecessary noise.
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index a3da148023..07d5ba883f 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; |