[Pkg-anonymity-tools] [torbrowser-launcher] 31/47: Merge branch 'intrigeri-gh92-rework-AppArmor-profiles'

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository torbrowser-launcher.

commit efad43187711aa23f2042f5a7a9703bcdb5dc384
Merge: 71f2613 b67afb8
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Jul 29 11:04:20 2014 -0700

    Merge branch 'intrigeri-gh92-rework-AppArmor-profiles'

 apparmor/torbrowser.Browser.firefox   | 98 +++++++++++++----------------------
 apparmor/torbrowser.Tor.tor           | 12 ++---
 apparmor/torbrowser.start-tor-browser |  8 +--
 apparmor/usr.bin.torbrowser-launcher  | 28 +++-------
 4 files changed, 53 insertions(+), 93 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git