diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-08-26 14:32:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-13 12:36:40 -0400 |
| commit | a6cad4db7063885aee2eceea7c481bc7583e1a4f (patch) | |
| tree | 0dce3da28e82baa56267e24a3ec2574235207fc5 /src/or | |
| parent | 675eb1fea76c11be9f2bb02275b80833a0cde7fa (diff) | |
| download | tor-a6cad4db7063885aee2eceea7c481bc7583e1a4f.tar tor-a6cad4db7063885aee2eceea7c481bc7583e1a4f.tar.gz | |
Add '--digests' to "that which implies --hush."
And have these various commandline options imply "hush", not "quiet",
since we like to see warnings.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index 22519f04a..598d099d2 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); |