commit f067067ee66e104b2d1e97fb881bf6d2277ea589 Merge: 3890c81 2b4d4ff Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 23 17:14:54 2011 -0500
Merge branch 'bug2474'
Had to resolve conflicts wrt the " (using bufferevents)" addition to the startup string.
Conflicts: src/or/main.c
changes/bug2474 | 5 +++++ src/or/main.c | 20 +++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-)
diff --cc src/or/main.c index c1a7015,f6f47db..7008d38 --- a/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;