diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-13 12:55:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-13 12:55:53 -0400 |
| commit | 25a3ae922f2f378c16c5930b76c33917480120d8 (patch) | |
| tree | ba6549160a7855e3e94b969c947ff9b62397abf3 /src/or/main.c | |
| parent | f4db0f429a47be9ab5f555333a0031fa67a2728a (diff) | |
| parent | b539b372058613b94ef31073de6595ac5d882fd1 (diff) | |
| download | tor-25a3ae922f2f378c16c5930b76c33917480120d8.tar.gz tor-25a3ae922f2f378c16c5930b76c33917480120d8.zip | |
Merge remote-tracking branch 'Ryman/bug6384'
Conflicts:
src/or/config.c
src/or/main.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index ceee29ce66..ac756de5d2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2351,9 +2351,10 @@ tor_init(int argc, char *argv[]) if (!strcmp(cl->key, "--quiet") || !strcmp(cl->key, "--dump-config")) quiet = 2; - /* --version, --digests, and --help imply --husth */ + /* --version, --digests, and --help imply --hush */ if (!strcmp(cl->key, "--version") || !strcmp(cl->key, "--digests") || !strcmp(cl->key, "--list-torrc-options") || + !strcmp(cl->key, "--library-versions") || !strcmp(cl->key, "-h") || !strcmp(cl->key, "--help")) quiet = 1; } @@ -2382,11 +2383,12 @@ tor_init(int argc, char *argv[]) #else ""; #endif - log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s " - "and OpenSSL %s.", version, bev_str, + log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s, " + "OpenSSL %s and Zlib %s.", version, bev_str, get_uname(), tor_libevent_get_version_str(), - crypto_openssl_get_version_str()); + crypto_openssl_get_version_str(), + tor_zlib_get_version_str()); log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! " "Learn how to be safe at " |