[or-cvs] Remove the EVENT_NOEPOLL block from etc/default/tor.

[Peter Palfrader]

Update of /home/or/cvsroot/tor/debian
In directory moria:/tmp/cvs-serv15021

Modified Files:
	changelog tor.default 
Log Message:
Remove the EVENT_NOEPOLL block from etc/default/tor.
Add an ARGS block to etc/default/tor as suggested in #338425.


Index: changelog
===================================================================
RCS file: /home/or/cvsroot/tor/debian/changelog,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- changelog	15 Nov 2005 10:28:00 -0000	1.139
+++ changelog	15 Nov 2005 10:30:36 -0000	1.140
@@ -6,8 +6,10 @@
   * 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 at debian.org>  Tue, 15 Nov 2005 11:27:01 +0100
+ -- Peter Palfrader <weasel at debian.org>  Tue, 15 Nov 2005 11:28:40 +0100
 
 tor (0.1.1.8-alpha-1) experimental; urgency=low
 

Index: tor.default
===================================================================
RCS file: /home/or/cvsroot/tor/debian/tor.default,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tor.default	22 Aug 2005 00:48:21 -0000	1.8
+++ tor.default	15 Nov 2005 10:30:36 -0000	1.9
@@ -24,20 +24,9 @@
 #
 # 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 at 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