Remove the EVENT_NOEPOLL block from etc/default/tor.

Add an ARGS block to etc/default/tor as suggested in #338425.


svn:r5381

2 files changed, 5 insertions, 14 deletions

diff --git a/changelog b/changelog
index a0a26cb42d..a58d82faa1 100644
--- a/changelog
+++ b/changelog
@@ -6,8 +6,10 @@ tor (0.1.1.9-alpha-0) experimental; urgency=low
   * Also ship doc/{socks-extensions.txt,tor-doc-server.html,tor-doc-unix.html}
   * Use bin/bash for the init script instead of bin/sh.  We are using
     ulimit -n which is not POSIX  (closes: #338797).
+  * Remove the EVENT_NOEPOLL block from etc/default/tor.
+  * Add an ARGS block to etc/default/tor as suggested in #338425.
 
- -- Peter Palfrader <weasel@debian.org>  Tue, 15 Nov 2005 11:27:01 +0100
+ -- Peter Palfrader <weasel@debian.org>  Tue, 15 Nov 2005 11:28:40 +0100
 
 tor (0.1.1.8-alpha-1) experimental; urgency=low
 
diff --git a/tor.default b/tor.default
index 66c842ad73..19ef0895a4 100644
--- a/tor.default
+++ b/tor.default
@@ -24,20 +24,9 @@ MAX_FILEDESCRIPTORS=4096
 #
 # NICE="--nicelevel 5"
 
+# Additional arguments to pass on tor's command line.
 #
-# 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 amd64.
-#
-# If tor does not work at all for you, i.e. connection attempts
-# through tor just hang 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
+# ARGS=""
 
 #
 # Uncomment this if you want to get coredumps