[Pkg-privacy-commits] [onionshare] 162/256: Merge branch 'master' into tor-bundle-autoupdate

[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 984d3f9c11a1ea6117ec82a626d17b770874d45c
Merge: 90e8221 2f426fb
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Apr 18 16:07:46 2017 -0700

    Merge branch 'master' into tor-bundle-autoupdate

 install/build_osx.sh      |  3 +-
 install/get-tor-osx.py    | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 install/pyinstaller.spec  |  1 +
 onionshare/helpers.py     |  6 ++--
 onionshare/onion.py       |  2 +-
 onionshare/onionshare-gui |  1 +
 6 files changed, 91 insertions(+), 4 deletions(-)


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