diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-01 11:01:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-01 11:01:18 -0400 |
| commit | a80d8e09d3b5f393f2dc83148ef66c6e1d7f4015 (patch) | |
| tree | 86b6a2f114adf80b64401b21741d3328ed14d840 | |
| parent | f128baf36c8378d40b82a2859f3c939c1d0f77dd (diff) | |
| download | tor-a80d8e09d3b5f393f2dc83148ef66c6e1d7f4015.tar.gz tor-a80d8e09d3b5f393f2dc83148ef66c6e1d7f4015.zip | |
The --version option should imply --quiet.
Patch from 'maker'.
| -rw-r--r-- | changes/ticket6997 | 2 | ||||
| -rw-r--r-- | src/or/main.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket6997 b/changes/ticket6997 new file mode 100644 index 0000000000..0a33b37552 --- /dev/null +++ b/changes/ticket6997 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Command-line option "--version" implies "--quiet". Closes ticket #6997. diff --git a/src/or/main.c b/src/or/main.c index 635dcb4bd5..74bb696725 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2293,6 +2293,9 @@ tor_init(int argc, char *argv[]) quiet = 1; if (!strcmp(argv[i], "--quiet")) quiet = 2; + /* --version implies --quiet */ + if (!strcmp(argv[i], "--version")) + quiet = 2; } /* give it somewhere to log to initially */ switch (quiet) { |