Merge branch 'ticket30452_035_v3' into ticket30452_041_v3

This commit is contained in:
Nick Mathewson 2019-05-14 19:55:51 -04:00
commit 370ea8d23b

View File

@ -561,6 +561,7 @@ tor_init(int argc, char *argv[])
if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") ||
!strcmp(cl->key, "--list-torrc-options") || !strcmp(cl->key, "--list-torrc-options") ||
!strcmp(cl->key, "--library-versions") || !strcmp(cl->key, "--library-versions") ||
!strcmp(cl->key, "--list-modules") ||
!strcmp(cl->key, "--hash-password") || !strcmp(cl->key, "--hash-password") ||
!strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) { !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) {
if (quiet < 1) if (quiet < 1)