diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-05-14 19:55:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-05-14 19:55:51 -0400 |
| commit | 370ea8d23b05fbf725f1474ed734233c3a7197e4 (patch) | |
| tree | 06771fc4db69d0357b6049105daf5262a448b145 /src/app/main/main.c | |
| parent | dd537ba35fbb22efb8c6ed0d6b623269531d7900 (diff) | |
| parent | 0c451b31d2694c96ec20145e3b0e9b22cd54819d (diff) | |
| download | tor-370ea8d23b05fbf725f1474ed734233c3a7197e4.tar.gz tor-370ea8d23b05fbf725f1474ed734233c3a7197e4.zip | |
Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
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 184b9e91da..6e325f0b10 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -561,6 +561,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) |