summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-14 13:56:42 +0000
committerintrigeri <intrigeri@boum.org>2019-03-14 13:56:42 +0000
commitb7a86ad32a5861a41eddab64e0c32db628cfa585 (patch)
treee9eec6bc0719679056496164141caadb45f8aaec
parentc3e4e2caf1b81d879857d6425a938abbcb82e4ed (diff)
parent7168d2ff008971f1cc39f87c21f0087156adfbbd (diff)
Merge remote-tracking branch 'origin/bugfix/16348-tor-0.3.5+force-all-tests' into stable (Fix-committed: #16348)
-rw-r--r--config/APT_snapshots.d/torproject/serial2
-rw-r--r--config/chroot_apt/preferences5
2 files changed, 1 insertions, 6 deletions
diff --git a/config/APT_snapshots.d/torproject/serial b/config/APT_snapshots.d/torproject/serial
index 4318642..536c7ed 100644
--- a/config/APT_snapshots.d/torproject/serial
+++ b/config/APT_snapshots.d/torproject/serial
@@ -1 +1 @@
-2019011801
+2019031301
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 3c9f653..dfe1465 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -106,11 +106,6 @@ Package: tails-installer
Pin: origin deb.tails.boum.org
Pin-Priority: 999
-Explanation: #16348
-Package: tor tor-geoipdb
-Pin: origin deb.tails.boum.org
-Pin-Priority: 999
-
Package: virtualbox*
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999