Add a snippet to disable epoll in etc/default/tor, commented out.

svn:r3513

2 files changed, 17 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 74c3678f7e..eec64ad652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ tor (0.1.0.0-alpha-cvs-1) UNRELEASED; urgency=low
     give existing connections a grace period of 30 seconds in
     which they might complete their task.  If you just run a
     client it should make no difference.
+  * Add a snippet to disable epoll in etc/default/tor, commented out.
 
- -- Peter Palfrader <weasel@debian.org>  Wed,  2 Feb 2005 07:47:39 +0100
+ -- Peter Palfrader <weasel@debian.org>  Thu,  3 Feb 2005 12:20:07 +0100
 
 tor (0.0.9.3-1) unstable; urgency=low
 
diff --git a/debian/tor.default b/debian/tor.default
index 92491c2b1d..43021aa1f2 100644
--- a/debian/tor.default
+++ b/debian/tor.default
@@ -15,6 +15,21 @@ RUN_DAEMON="yes"
 MAX_FILEDESCRIPTORS=4096
 
 #
+# Sometimes epoll is broken.  This happens to be the case on
+# at least the maintainer's desktop box running Linux 2.6.11-rc1
+# on adm64.
+#
+# If tor does not work at all for you, i.e. connection attempts
+# through tor just have forever and never finish, then consider
+# setting EVENT_NOEPOLL, so libevent does not use epoll.  If that
+# happens to fix it for you, please let the mainainer (weasel@debian.org)
+# know, mentioning your kernel version, libevent version, and architecture.
+# Thanks!
+#
+# EVENT_NOEPOLL=yes
+# export EVENT_NOEPOLL
+
+#
 # Uncomment this if you want to get coredumps
 #
 ulimit -c unlimited