[Pkg-privacy-commits] [onionshare] 22/256: Merge branch 'master' of https://github.com/micahflee/onionshare

[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 51f538edeefc98113642d01c229db1c29c15f17e
Merge: 1d03173 5ebc745
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu Dec 22 19:12:38 2016 +0100

    Merge branch 'master' of https://github.com/micahflee/onionshare

 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 +
 onionshare/onion.py                   |     5 +-
 onionshare/web.py                     |     9 +-
 resources/wordlist.txt                | 11802 +++++++++++++++++---------------
 8 files changed, 6470 insertions(+), 5417 deletions(-)

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