nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug2474'

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

Conflicts:
	src/or/main.c
This commit is contained in:
Nick Mathewson 2011-11-23 17:14:54 -05:00
commit f067067ee6
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug2474 Normal file
View File

@ -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.

20
src/or/main.c
View File

@ -2237,14 +2237,24 @@ tor_init(int argc, char *argv[])
} }
quiet_level = quiet; 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 #ifdef USE_BUFFEREVENTS
" (with bufferevents)", " (with bufferevents)",
#else #else
"", "",
#endif #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) { if (network_init()<0) {
log_err(LD_BUG,"Error initializing network; exiting."); log_err(LD_BUG,"Error initializing network; exiting.");