[Pkg-privacy-commits] [onionshare] 20/256: Merge branch 'apparmor' of https://github.com/u451f/onionshare into u451f-apparmor

[Ulrike Uhlig]

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

ulrike pushed a commit to branch master
in repository onionshare.

commit f2dbced33d85c8bb38bfcaecb412bdb56a259d7e
Merge: 9cd41bf 9bc87b2
Author: Micah Lee <micah at micahflee.com>
Date:   Wed Dec 21 23:16:42 2016 -0800

    Merge branch 'apparmor' of https://github.com/u451f/onionshare into u451f-apparmor

 apparmor/abstractions/onionshare      | 31 +++++++++++++++++++++++++++++++
 apparmor/local/usr.bin.onionshare     |  2 ++
 apparmor/local/usr.bin.onionshare-gui |  2 ++
 apparmor/usr.bin.onionshare           | 10 ++++++++++
 apparmor/usr.bin.onionshare-gui       | 26 ++++++++++++++++++++++++++
 5 files changed, 71 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git