diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-06-29 03:50:37 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2013-06-29 03:50:37 -0400 |
commit | 81a5ee77ec6df66ca9a5044bdf127b11922e0dd9 (patch) | |
tree | 1ddf23ffec508861077be7a0d9f4e8c994c86e12 /src | |
parent | ca6aacce16ce057bab71900e078a24fcd63d250f (diff) | |
parent | c9551492715c0b840f65992692581eb555c0930d (diff) | |
download | tor-81a5ee77ec6df66ca9a5044bdf127b11922e0dd9.tar tor-81a5ee77ec6df66ca9a5044bdf127b11922e0dd9.tar.gz |
Merge branch 'bug9147' into 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 fd8b6cf67..bd23141b9 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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 |