[Pkg-anonymity-tools] [onionshare] 14/57: Merge pull request #161 from ThomasWaldmann/fixes

[Ulrike Uhlig]

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

u-guest pushed a commit to annotated tag 0.7
in repository onionshare.

commit 0812e371aacf544c7f8c8601313a394588b2fbb7
Merge: dc9d88c 46492e0
Author: Micah Lee <micah at micahflee.com>
Date:   Mon Nov 17 10:58:29 2014 -0800

    Merge pull request #161 from ThomasWaldmann/fixes
    
    some minor fixes

 CHANGELOG.md            | 2 +-
 check_lacked_trans.py   | 2 +-
 onionshare/index.html   | 2 +-
 onionshare/socks.py     | 2 +-
 onionshare/web.py       | 4 ++--
 tails/README.md         | 2 +-
 test/onionshare_test.py | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git