[Pkg-privacy-commits] [onionshare] 104/256: Merge branch 'tor-protocol-error'

[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 8f15aa1642eb1ed7c2c33943c0deb88084fe2c0a
Merge: 58f49b6 daad464
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Feb 23 08:44:22 2017 -0800

    Merge branch 'tor-protocol-error'

 onionshare/__init__.py            |  2 +-
 onionshare/onion.py               | 23 +++++++++++++++++------
 onionshare/web.py                 |  9 ++++++++-
 onionshare_gui/__init__.py        |  2 +-
 onionshare_gui/settings_dialog.py |  4 ++--
 share/locale/en.json              |  3 ++-
 6 files changed, 31 insertions(+), 12 deletions(-)

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