diff options
author | Peter Palfrader <peter@palfrader.org> | 2005-11-15 10:30:36 +0000 |
---|---|---|
committer | Peter Palfrader <peter@palfrader.org> | 2005-11-15 10:30:36 +0000 |
commit | 333e179f3ecdee8ed368bd5dbe1dbd70ae6c3fe7 (patch) | |
tree | 0336fe5e258731f04a36ff8ead455049ae524c21 /debian | |
parent | b52c4bfe09212adde82ed28966bc76b2ce8803d4 (diff) | |
download | tor-333e179f3ecdee8ed368bd5dbe1dbd70ae6c3fe7.tar.gz tor-333e179f3ecdee8ed368bd5dbe1dbd70ae6c3fe7.zip |
Remove the EVENT_NOEPOLL block from etc/default/tor.
Add an ARGS block to etc/default/tor as suggested in #338425.
svn:r5381
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/tor.default | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog index a0a26cb42d..a58d82faa1 100644 --- a/debian/changelog +++ b/debian/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/debian/tor.default b/debian/tor.default index 66c842ad73..19ef0895a4 100644 --- a/debian/tor.default +++ b/debian/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 |