diff options
author | Peter Palfrader <peter@palfrader.org> | 2008-06-04 08:39:02 +0000 |
---|---|---|
committer | Peter Palfrader <peter@palfrader.org> | 2008-06-04 08:39:02 +0000 |
commit | 81429fdc348d4171053c96a203399d5598165ac9 (patch) | |
tree | d70b56fce551e0560530c7fa31f44ba2dcb405b4 /debian/control | |
parent | 00405468aad5b94e3325aa19424482422e31a471 (diff) | |
download | tor-81429fdc348d4171053c96a203399d5598165ac9.tar tor-81429fdc348d4171053c96a203399d5598165ac9.tar.gz |
Forward port debian 0.2.0.26-rc-1 to trunk
svn:r14933
Diffstat (limited to 'debian/control')
-rw-r--r-- | debian/control | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/control b/debian/control index 5d54a40e0..c53e254d3 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Standards-Version: 3.7.2 Package: tor Architecture: any Depends: ${shlibs:Depends}, adduser, tsocks +Conflicts: libssl0.9.8 (<< 0.9.8g-9) Recommends: privoxy | polipo (>= 1), socat, logrotate Suggests: mixmaster, mixminion, anon-proxy Description: anonymizing overlay network for TCP |