[Pkg-privacy-commits] [onionshare] 161/256: Merge branch 'tor-bundle' into 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 2f426fb8b211d1a2812b3bafc91a62badeea6a8c
Merge: dff13d9 6d58d5d
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Apr 18 16:00:24 2017 -0700

    Merge branch 'tor-bundle' into 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