diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-05 16:10:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-05 16:10:51 -0400 |
| commit | a56d7e37aa8f52397f9fd762d07b85f3360afd2a (patch) | |
| tree | ba5a02b7a50a17698574773630b09b4fc8151a17 /src/app/main/main.c | |
| parent | 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d (diff) | |
| parent | 0c451b31d2694c96ec20145e3b0e9b22cd54819d (diff) | |
| download | tor-a56d7e37aa8f52397f9fd762d07b85f3360afd2a.tar.gz tor-a56d7e37aa8f52397f9fd762d07b85f3360afd2a.zip | |
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
Diffstat (limited to 'src/app/main/main.c')
| -rw-r--r-- | src/app/main/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c index 0ffc27d456..4b60763f75 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -579,6 +579,7 @@ tor_init(int argc, char *argv[]) if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || !strcmp(cl->key, "--list-torrc-options") || !strcmp(cl->key, "--library-versions") || + !strcmp(cl->key, "--list-modules") || !strcmp(cl->key, "--hash-password") || !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) { if (quiet < 1) |