summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-08 22:58:21 +0000
committerintrigeri <intrigeri@boum.org>2015-05-08 22:58:21 +0000
commita6980b7c23ef8fc3a007cb24bec7b4efdb306ad7 (patch)
tree0b488432ac75c93bfb8c35a0dc9c802d1e59d6fa /config/chroot_local-patches
parentb610af0d6cc7ff339ee10e32cdeb2716f8d9ac58 (diff)
parent5b642ad26d83632ed72631b886e4cb4827270e51 (diff)
Merge remote-tracking branch 'origin/testing' into bugfix/8007-AppArmor-hardening
Conflicts: wiki/src/contribute/design/application_isolation.mdwn
Diffstat (limited to 'config/chroot_local-patches')
-rw-r--r--config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff8
1 files changed, 0 insertions, 8 deletions
diff --git a/config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff b/config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff
deleted file mode 100644
index 73e3a8e..0000000
--- a/config/chroot_local-patches/apparmor-adjust-tor-abstraction.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/etc/apparmor.d/abstractions/tor 2015-02-10 11:41:02.140216000 +0000
-+++ b/etc/apparmor.d/abstractions/tor 2015-02-10 11:41:11.468216000 +0000
-@@ -24,3 +24,4 @@
- /usr/share/tor/** r,
-
- /usr/bin/obfsproxy PUx,
-+ /usr/bin/obfs4proxy PUx,
-