Merge branch 'bug9147' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-06-29 03:50:37 -04:00
commit 81a5ee77ec
2 changed files with 11 additions and 0 deletions

4
changes/bug9147 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Issue a warning when running with the bufferevents backend enabled.
It's still not stable, and people should know that they're likely
to hit unexpected problems. Closes ticket 9147.

View File

@ -1882,6 +1882,13 @@ do_main_loop(void)
}
}
#ifdef USE_BUFFEREVENTS
log_warn(LD_GENERAL, "Tor was compiled with the --enable-bufferevents "
"option. This is still experimental, and might cause strange "
"bugs. If you want a more stable Tor, be sure to build without "
"--enable-bufferevents.");
#endif
handle_signals(1);
/* load the private keys, if we're supposed to have them, and set up the