From 4f7587a5ed64b2b5894157103d2d50f543434d64 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 28 Apr 2011 22:00:22 -0400 Subject: [PATCH 1/2] Tweak the startup message to be more helpful Instead of just saying "boogity boogity!" let's actually warn people that they need to configure stuff right to be safe, and point them at instructions for how to do that. Resolves bug 2474. --- changes/bug2474 | 5 +++++ src/or/main.c | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 changes/bug2474 diff --git a/changes/bug2474 b/changes/bug2474 new file mode 100644 index 0000000000..02d3eb7ba9 --- /dev/null +++ b/changes/bug2474 @@ -0,0 +1,5 @@ + o Minor features + - Try to make the introductory warning message that Tor prints on + startup more useful for actually finding help and information. + Resolves bug2474. + diff --git a/src/or/main.c b/src/or/main.c index a26be39fdf..867dd60e9e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1886,9 +1886,19 @@ tor_init(int argc, char *argv[]) add_temp_log(LOG_NOTICE); } - log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. " - "Do not rely on it for strong anonymity. (Running on %s)",get_version(), - get_uname()); + { + const char *version = get_version(); + log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname()); + + log_notice(LD_GENERAL, "WARNING: Tor can't help you if you use it wrong. " + "Learn how to be safe at " + "https://www.torproject.org/download/download#warning"); + + if (strstr(version, "alpha")) + log_notice(LD_GENERAL, "This is an alpha release; do not rely on it for " + "strong anonymity."); + } + if (network_init()<0) { log_err(LD_BUG,"Error initializing network; exiting."); From 2b4d4ffa8f2d893cf5df1480aa2db86e75e8292a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Wed, 23 Nov 2011 17:09:36 -0500 Subject: [PATCH 2/2] Tweak the "this is not a stable release" warning some more --- src/or/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 867dd60e9e..f6f47dba2c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1894,9 +1894,9 @@ tor_init(int argc, char *argv[]) "Learn how to be safe at " "https://www.torproject.org/download/download#warning"); - if (strstr(version, "alpha")) - log_notice(LD_GENERAL, "This is an alpha release; do not rely on it for " - "strong anonymity."); + if (strstr(version, "alpha") || strstr(version, "beta")) + log_notice(LD_GENERAL, "This version is not a stable Tor release. " + "Expect more bugs than usual."); }