Merge branch 'gh92-rework-AppArmor-profiles' of https://github.com/intrigeri/torbrows...

Conflicts:
	apparmor/torbrowser.Browser.firefox
	apparmor/torbrowser.Tor.tor
	apparmor/torbrowser.start-tor-browser

diff --cc apparmor/torbrowser.Browser.firefox
index 4b01a53a911984680f1c76489f828ef6fd879e8d,b045ba710a8bcdf6779b0c6399d6c12d8ddabf30..e324dabe19d1e8c7c28295a28548b092e681c786
--- 1/apparmor/torbrowser.Browser.firefox
--- 2/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
@@@ -1,8 -1,7 +1,6 @@@
  #include <tunables/global>
  
- @{HOME}/.torbrowser/tbb/{stable,alpha}/{i686,x86_64}/tor-browser_*/Browser/firefox {
-   #include <abstractions/base>
-   #include <abstractions/user-tmp>
 -/home/*/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox {
 -  #include <abstractions/gnome>
++@{HOME}/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox {
  
    network tcp,
  

diff --cc apparmor/torbrowser.Tor.tor
index 9bc89bd9c653c45e472dca3d704be0fcda602f41,7b12a32202642673eb3257aca5f1939676b53072..0a63d3dd6530e378ae7afc0dc8baa9ee2dc93a8f
--- 1/apparmor/torbrowser.Tor.tor
--- 2/apparmor/torbrowser.Tor.tor
+++ b/apparmor/torbrowser.Tor.tor
@@@ -1,6 -1,6 +1,6 @@@
  #include <tunables/global>
  
- @{HOME}/.torbrowser/tbb/{stable,alpha}/{i686,x86_64}/tor-browser_*/Tor/tor {
 -/home/*/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Tor/tor {
++@{HOME}/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/Tor/tor {
    #include <abstractions/base>
  
    network tcp,

diff --cc apparmor/torbrowser.start-tor-browser
index d629400289426cf4a69556e6986d7d5570f78bfc,770fd8bb31c951c7b6af44f057beb7e7298d4082..77dd5b2c18d1d195b185368fad81359ba33c482b
--- 1/apparmor/torbrowser.start-tor-browser
--- 2/apparmor/torbrowser.start-tor-browser
+++ b/apparmor/torbrowser.start-tor-browser
@@@ -1,6 -1,6 +1,6 @@@
  #include <tunables/global>
  
- @{HOME}/.torbrowser/tbb/{stable,alpha}/{i686,x86_64}/tor-browser_*/start-tor-browser {
 -/home/*/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/start-tor-browser {
++@{Home}/.torbrowser/tbb/{i686,x86_64}/tor-browser_*/start-tor-browser {
    #include <abstractions/base>
    #include <abstractions/bash>