summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-patches
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-05-01 16:59:46 +0000
committerintrigeri <intrigeri@boum.org>2015-05-01 16:59:46 +0000
commit4c4ed5cb4c5248ad74c51442d3006ab6ff3dc228 (patch)
treee83d57bee112325edf8b850a5c52b2fedc9f128f /config/chroot_local-patches
parent640136973f14d83190babef9b43d1b660709e3c6 (diff)
parent4568f7e83c1fd2de62726e2f8cf276e6b8522a56 (diff)
Merge branch 'devel' into feature/jessie
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,
-