summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2017-03-25 00:29:01 +0100
committeranonym <anonym@riseup.net>2017-03-25 00:29:01 +0100
commita6426d294e9cb658470193b7047ecd7490a80f9b (patch)
tree7e40a8bb892267fac5070b61a3c65c429add3837
parent1f62931542116b364f03b2e24caf47b6035019f9 (diff)
parent288218999a0e52b8a4337be83aa02ae55f497fcc (diff)
Merge remote-tracking branch 'origin/feature/tor-nightly-master' into test/tor-bootstrap-robustness_tor-0.3.1.xtest/tor-bootstrap-robustness_tor-0.3.1.x
-rw-r--r--config/chroot_apt/preferences4
-rw-r--r--config/chroot_sources/torproject.chroot1
2 files changed, 5 insertions, 0 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 83f6b07..08e341c 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -154,6 +154,10 @@ Package: ttdnsd
Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Package: tor tor-geoipdb
+Pin: release o=TorProject,n=tor-nightly-master-jessie
+Pin-Priority: 999
+
Package: torsocks
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
diff --git a/config/chroot_sources/torproject.chroot b/config/chroot_sources/torproject.chroot
index 5354da0..16da222 100644
--- a/config/chroot_sources/torproject.chroot
+++ b/config/chroot_sources/torproject.chroot
@@ -1,2 +1,3 @@
deb http://deb.torproject.org/torproject.org jessie main
deb http://deb.torproject.org/torproject.org sid main
+deb http://deb.torproject.org/torproject.org tor-nightly-master-jessie main