[Pkg-privacy-commits] [onionshare] 03/16: Merge branch 'fred-a-kemp-feature/tor-control-port-from-env'

[Ulrike Uhlig]

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

ulrike pushed a commit to branch debian
in repository onionshare.

commit d8b0a4e152d59ada9dc737045f6343a8c9900f55
Merge: 373f24e c74d892
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Sep 27 14:09:39 2016 -0700

    Merge branch 'fred-a-kemp-feature/tor-control-port-from-env'

 onionshare/onion.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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