Merge remote-tracking branch 'Ryman/bug6384'

Conflicts:
	src/or/config.c
	src/or/main.c

2 files changed, 25 insertions, 4 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 9a8d1e77f..5ce7bad49 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -46,6 +46,7 @@
 #include "statefile.h"
 #include "transports.h"
 #include "ext_orport.h"
+#include "torgzip.h"
 #ifdef _WIN32
 #include <shlobj.h>
 #endif
@@ -1808,6 +1809,7 @@ static const struct {
   { "--quiet",                0 },
   { "--hush",                 0 },
   { "--version",              0 },
+  { "--library-versions",     0 },
   { "-h",                     0 },
   { "--help",                 0 },
   { "--list-torrc-options",   0 },
@@ -3932,6 +3934,7 @@ options_init_from_torrc(int argc, char **argv)
     printf("Tor version %s.\n",get_version());
     exit(0);
   }
+
   if (config_line_find(cmdline_only_options, "--digests")) {
     printf("Tor version %s.\n",get_version());
     printf("%s", libor_get_digests());
@@ -3939,6 +3942,22 @@ options_init_from_torrc(int argc, char **argv)
     exit(0);
   }
 
+  if (config_line_find(cmdline_only_options, "--library-versions")) {
+    printf("Tor version %s. \n", get_version());
+    printf("Library versions\tCompiled\t\tRuntime\n");
+    printf("Libevent\t\t%-15s\t\t%s\n",
+                      tor_libevent_get_header_version_str(),
+                      tor_libevent_get_version_str());
+    printf("OpenSSL \t\t%-15s\t\t%s\n",
+                      crypto_openssl_get_header_version_str(),
+                      crypto_openssl_get_version_str());
+    printf("Zlib    \t\t%-15s\t\t%s\n",
+                      tor_zlib_get_header_version_str(),
+                      tor_zlib_get_version_str());
+    //TODO: Hex versions?
+    exit(0);
+  }
+
   command = CMD_RUN_TOR;
   for (p_index = cmdline_only_options; p_index; p_index = p_index->next) {
     if (!strcmp(p_index->key,"--list-fingerprint")) {
diff --git a/src/or/main.c b/src/or/main.c
index ceee29ce6..ac756de5d 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 "