Merge 9746 into 0.1.2.x branch

svn:r9751
This commit is contained in:
Peter Palfrader 2007-03-06 20:55:10 +00:00
parent 197e4f8e5a
commit c05abaee94
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View File

@ -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.

2
debian/control vendored
View File

@ -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