[Pkg-privacy-commits] [onionshare] 09/66: Merge pull request #245 from garrettr/wait-for-ephemeral-hs

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository onionshare.

commit 4c40b89faffc447472eb6657d8b7126060473acc
Merge: 7c22ba1 9d5ba9b
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Jan 5 18:37:44 2016 -0800

    Merge pull request #245 from garrettr/wait-for-ephemeral-hs
    
    Revert to using wait_for_hs for ephemeral HS

 onionshare/hs.py                 | 2 +-
 onionshare/onionshare.py         | 7 +++----
 onionshare_gui/onionshare_gui.py | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)


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