aboutsummaryrefslogtreecommitdiff
path: root/src/app/main
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-20 16:37:11 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-20 16:37:11 -0400
commitd6570eaf5d8690799a1b698552315372fae2e1f0 (patch)
tree5e8824c24ce4c1e40b2071686531f0432bb00c25 /src/app/main
parentb18e2749191dd261462d12a315cd79fcbbccbefa (diff)
parent29307c0625fd6a95080d341b15646a4cd55b4178 (diff)
downloadtor-d6570eaf5d8690799a1b698552315372fae2e1f0.tar.gz
tor-d6570eaf5d8690799a1b698552315372fae2e1f0.zip
Merge remote-tracking branch 'tor-gitlab/mr/59'
Diffstat (limited to 'src/app/main')
-rw-r--r--src/app/main/main.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/app/main/main.c b/src/app/main/main.c
index 02c4c5bd58..e04663ec1d 100644
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -67,6 +67,7 @@
#include "lib/meminfo/meminfo.h"
#include "lib/osinfo/uname.h"
+#include "lib/osinfo/libc.h"
#include "lib/sandbox/sandbox.h"
#include "lib/fs/lockfile.h"
#include "lib/tls/tortls.h"
@@ -574,7 +575,8 @@ tor_init(int argc, char *argv[])
const char *version = get_version();
log_notice(LD_GENERAL, "Tor %s running on %s with Libevent %s, "
- "%s %s, Zlib %s, Liblzma %s, and Libzstd %s.", version,
+ "%s %s, Zlib %s, Liblzma %s, Libzstd %s and %s %s as libc.",
+ version,
get_uname(),
tor_libevent_get_version_str(),
crypto_get_library_name(),
@@ -584,7 +586,10 @@ tor_init(int argc, char *argv[])
tor_compress_supports_method(LZMA_METHOD) ?
tor_compress_version_str(LZMA_METHOD) : "N/A",
tor_compress_supports_method(ZSTD_METHOD) ?
- tor_compress_version_str(ZSTD_METHOD) : "N/A");
+ tor_compress_version_str(ZSTD_METHOD) : "N/A",
+ tor_libc_get_name() ?
+ tor_libc_get_name() : "Unknown",
+ tor_libc_get_version_str());
log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! "
"Learn how to be safe at "