[Pkg-privacy-commits] [onionshare] 06/256: Merge remote-tracking branch 'micahlee/master'

[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 7a8c5d935367f65144720d14c977d85df0e70556
Merge: 994445c 590edc5
Author: Ulrike Uhlig <u at 451f.org>
Date:   Tue Sep 6 13:44:22 2016 +0200

    Merge remote-tracking branch 'micahlee/master'

 BUILD.md                               |   49 +-
 MANIFEST.in                            |    1 +
 README.md                              |    6 +-
 SECURITY.md                            |    8 +-
 install/Info.plist                     |   18 +
 install/build_exe.bat                  |   10 +-
 install/build_osx.sh                   |   26 +-
 install/build_rpm.sh                   |    2 +-
 install/onionshare.nsi                 |  256 +++---
 install/ppa_release.sh                 |    4 +-
 install/pyinstaller.spec               |   59 --
 install/scripts/onionshare             |    9 +-
 install/scripts/onionshare-gui         |    9 +-
 install/scripts/onionshare-nautilus.py |   46 ++
 onionshare/helpers.py                  |   22 +-
 onionshare/{hs.py => onion.py}         |   67 +-
 onionshare/onionshare.py               |   38 +-
 onionshare/strings.py                  |    7 +-
 onionshare/web.py                      |    3 +-
 onionshare_gui/onionshare_gui.py       |   79 +-
 {install => resources}/license.txt     | 1352 ++++++++++++++++----------------
 resources/locale/cs.json               |   18 +-
 resources/locale/de.json               |    4 +-
 resources/locale/en.json               |   16 +-
 resources/locale/eo.json               |   12 +-
 resources/locale/es.json               |    6 +-
 resources/locale/fr.json               |    6 +-
 resources/locale/nl.json               |    6 +-
 resources/locale/tr.json               |    2 +-
 resources/version.txt                  |    2 +-
 setup.py                               |  165 ++--
 stdeb.cfg                              |    7 +-
 test/onionshare_helpers_test.py        |    2 -
 test/onionshare_strings_test.py        |   15 +-
 test/onionshare_test.py                |    1 -
 test/test_helpers.py                   |    5 +-
 36 files changed, 1192 insertions(+), 1146 deletions(-)

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