[Pkg-privacy-commits] [onionshare] 02/02: Merge branch 'debian' of ssh://git.debian.org/git/pkg-privacy/packages/onionshare into debian

[Ulrike Uhlig]

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

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

commit 11e373e45d2bc090620cf14a138b07b459c9e83f
Merge: 8310a21 2c00fe4
Author: Ulrike Uhlig <u at 451f.org>
Date:   Mon Mar 7 14:37:04 2016 +0100

    Merge branch 'debian' of ssh://git.debian.org/git/pkg-privacy/packages/onionshare into debian

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index 62b6491,e4881ad..e097a17
--- a/debian/control
+++ b/debian/control
@@@ -12,9 -12,9 +12,9 @@@ Vcs-Browser: https://anonscm.debian.org
  
  Package: onionshare
  Architecture: all
 -Depends: ${misc:Depends}, ${python:Depends}, python-flask, python-stem (>= 1.2.2), python-qt4, torbrowser-launcher
 +Depends: ${misc:Depends}, ${python:Depends}, python-flask, python-stem (>= 1.4.0), python-qt4, torbrowser-launcher
  Suggests: tor
- Description: Share a file over Tor Hidden Services anonymously and securely.
+ Description: Share a file over Tor Hidden Services anonymously and securely
   OnionShare lets you securely and anonymously share a file of any size with
   someone. It works by starting a web server, making it accessible as a Tor
   hidden service, and generating an unguessable URL to access and download

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