aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-06-29 03:50:37 -0400
committerNick Mathewson <nickm@torproject.org>2013-06-29 03:50:37 -0400
commit81a5ee77ec6df66ca9a5044bdf127b11922e0dd9 (patch)
tree1ddf23ffec508861077be7a0d9f4e8c994c86e12
parentca6aacce16ce057bab71900e078a24fcd63d250f (diff)
parentc9551492715c0b840f65992692581eb555c0930d (diff)
downloadtor-81a5ee77ec6df66ca9a5044bdf127b11922e0dd9.tar
tor-81a5ee77ec6df66ca9a5044bdf127b11922e0dd9.tar.gz
Merge branch 'bug9147' into maint-0.2.4
-rw-r--r--changes/bug91474
-rw-r--r--src/or/main.c7
2 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug9147 b/changes/bug9147
new file mode 100644
index 000000000..e6064ea0e
--- /dev/null
+++ b/changes/bug9147
@@ -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.
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