diff options
| author | Peter Palfrader <peter@palfrader.org> | 2007-03-06 20:55:10 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2007-03-06 20:55:10 +0000 |
| commit | c05abaee948dfa642fa61ab23a0ca20258790ff2 (patch) | |
| tree | f2cbbfcf952362f20a4a5d3191a1fc5e2bcd8cde | |
| parent | 197e4f8e5aac474a385612c97eef792aaee093bf (diff) | |
| download | tor-c05abaee948dfa642fa61ab23a0ca20258790ff2.tar.gz tor-c05abaee948dfa642fa61ab23a0ca20258790ff2.zip | |
Merge 9746 into 0.1.2.x branch
svn:r9751
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 61386b82be..b1d3ed6a7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +tor (0.1.2.8-beta-1) XX; urgency=low + + * Change recommends on privoxy to privoxy || polipo (>= 1) (closes: #413728). + + -- Peter Palfrader <weasel@debian.org> Tue, 6 Mar 2007 21:00:41 +0100 + tor (0.1.2.8-beta-1) experimental; urgency=low * upstream version. diff --git a/debian/control b/debian/control index 7820f3c4a1..ddeab7e823 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Standards-Version: 3.7.2 Package: tor Architecture: any Depends: ${shlibs:Depends}, adduser, tsocks -Recommends: privoxy, socat +Recommends: privoxy || polipo (>= 1), socat Suggests: mixmaster, mixminion, anon-proxy Description: anonymizing overlay network for TCP Tor is a connection-based low-latency anonymous communication system which |