Proactively check for upstream merge conflicts in our Tor Browser AppArmor profile

(As discussed on “[Tails-dev] Sandboxing Tor Browser: strategy for tracking ”upstream" AppArmor profile".)

Original created by @intrigeri on 8852 (Redmine)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information