Commit 8c458d92 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'feature/torsocks' into devel

parents a155a928 c069f505
......@@ -246,6 +246,10 @@ Package: spice-vdagent
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: torsocks
Pin: origin backports.debian.org
Pin-Priority: 999
Package: xul-ext-adblock-plus
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......
#!/bin/sh
set -e
# Move any /usr/bin/tsocks installed by any package out of the way,
# now (--rename) as well for any future one (hint: apt-get upgrade...).
dpkg-divert --rename --add /usr/bin/tsocks
......@@ -162,6 +162,7 @@ simple-scan
sshfs
system-config-printer
synaptic
torsocks
totem-plugins
traverso
ttf-dejavu
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment