diff options
| author | Peter Palfrader <peter@palfrader.org> | 2007-03-07 09:21:24 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2007-03-07 09:21:24 +0000 |
| commit | 83e6aef50dc0b5f1e8f38de5744a425fff81229f (patch) | |
| tree | 8965cd91c626dac9022260902b65d19a0306c5c2 /debian | |
| parent | 2036470b62910f9ea8b7782958ad4031087b6423 (diff) | |
| download | tor-83e6aef50dc0b5f1e8f38de5744a425fff81229f.tar tor-83e6aef50dc0b5f1e8f38de5744a425fff81229f.tar.gz | |
Forward port r9754: It only is a single |, not two
svn:r9755
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index b1d3ed6a7..b2499957e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ tor (0.1.2.8-beta-1) XX; urgency=low - * Change recommends on privoxy to privoxy || polipo (>= 1) (closes: #413728). + * Change recommends on privoxy to privoxy | polipo (>= 1) (closes: #413728). - -- Peter Palfrader <weasel@debian.org> Tue, 6 Mar 2007 21:00:41 +0100 + -- Peter Palfrader <weasel@debian.org> Wed, 7 Mar 2007 10:19:54 +0100 tor (0.1.2.8-beta-1) experimental; urgency=low diff --git a/debian/control b/debian/control index ddeab7e82..82a2c2764 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 || polipo (>= 1), 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 |