Merge branch 'bug2474'

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

Conflicts:
	src/or/main.c

diff --cc src/or/main.c
index c1a7015e682adf846dbd3e134a362e31424cd0de,f6f47dba2c2e91d1e65d93a1cbcbe437ecc26ec2..7008d388a1170e8df6bcaca50df811cb5fb39e06
--- 1/src/or/main.c
--- 2/src/or/main.c
+++ b/src/or/main.c
@@@ -2235,17 -1885,21 +2235,27 @@@ tor_init(int argc, char *argv[]
      default:
        add_temp_log(LOG_NOTICE);
    }
 +  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 running on %s.", version, get_uname());
++    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.");
      return -1;