summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-06 11:32:09 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-06 11:32:09 -0400
commit1ca9e2685f6cea803ff1a36c7dbe05625e9c4b61 (patch)
tree133b4988c631c91ed260422b60112bf911d238e7 /src/or/main.c
parentad1e8b45df3933e6f01098a5f9ba6238adafc9c2 (diff)
parent7607ad2becc9634f01ca6dd99a0475ecf276ac93 (diff)
downloadtor-1ca9e2685f6cea803ff1a36c7dbe05625e9c4b61.tar.gz
tor-1ca9e2685f6cea803ff1a36c7dbe05625e9c4b61.zip
Merge branch 'quiet_lib_versions_squashed'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 75a6d65410..39eccd6e65 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2308,12 +2308,16 @@ tor_init(int argc, char *argv[])
{
const char *version = get_version();
+ log_notice(LD_GENERAL, "Tor v%s %srunning on %s with Libevent %s "
+ "and OpenSSL %s.", version,
#ifdef USE_BUFFEREVENTS
- log_notice(LD_GENERAL, "Tor v%s (with bufferevents) running on %s.",
- version, get_uname());
+ "(with bufferevents) ",
#else
- log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname());
+ "",
#endif
+ get_uname(),
+ tor_libevent_get_version_str(),
+ crypto_openssl_get_version_str());
log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! "
"Learn how to be safe at "