diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-06-29 03:51:53 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-06-29 03:51:53 -0400 |
commit | 0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0 (patch) | |
tree | 8f6ba8632c927ec2e6f187421efc175a1fc723df /src | |
parent | cde1a2ca059d892a970c57fc265261125aefe2cb (diff) | |
parent | 81a5ee77ec6df66ca9a5044bdf127b11922e0dd9 (diff) | |
download | tor-0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0.tar tor-0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0.tar.gz |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src')
-rw-r--r-- | src/or/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 8e2845f47..85aa97f5a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1891,6 +1891,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 |