Merge branch 'bug2474'

Had to resolve conflicts wrt the " (using bufferevents)" addition to the
startup string.

Conflicts:
	src/or/main.c

2 files changed, 20 insertions, 5 deletions

diff --git a/changes/bug2474 b/changes/bug2474
new file mode 100644
index 000000000..02d3eb7ba
--- /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 c1a7015e6..7008d388a 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2237,14 +2237,24 @@ tor_init(int argc, char *argv[])
   }
   quiet_level = quiet;
 
-  log(LOG_NOTICE, LD_GENERAL, "Tor v%s%s. This is experimental software. "
-      "Do not rely on it for strong anonymity. (Running on %s)", get_version(),
+  {
+    const char *version = get_version();
+    log_notice(LD_GENERAL, "Tor v%s%s running on %s.", version,
 #ifdef USE_BUFFEREVENTS
-      " (with bufferevents)",
+               " (with bufferevents)",
 #else
-      "",
+               "",
 #endif
-      get_uname());
+               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") || strstr(version, "beta"))
+      log_notice(LD_GENERAL, "This version is not a stable Tor release. "
+                 "Expect more bugs than usual.");
+  }
 
   if (network_init()<0) {
     log_err(LD_BUG,"Error initializing network; exiting.");