[Pkg-anonymity-tools] [onionshare] 01/02: Merge branch 'master' 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 2d7e0ef353cd8bd20129a0e8cb92dedc803712af
Merge: ef6dbaf 89d6c3c
Author: Ulrike Uhlig <u at 451f.org>
Date:   Fri Sep 26 20:30:35 2014 +0100

    Merge branch 'master' into debian

 .gitignore                                         |   4 +
 .travis.yml                                        |  10 +
 BUILD.md                                           |  24 +-
 CHANGELOG.md                                       |  16 +
 MANIFEST.in                                        |   4 +-
 README.md                                          |  30 +-
 bin/onionshare                                     |  19 +
 bin/onionshare-gui                                 |  19 +
 build_exe.bat                                      |   8 +-
 images/drop_files.png                              | Bin 0 -> 2035 bytes
 {onionshare_gui/static => images}/logo.png         | Bin
 images/server_started.png                          | Bin 0 -> 346 bytes
 images/server_stopped.png                          | Bin 0 -> 286 bytes
 images/server_working.png                          | Bin 0 -> 338 bytes
 locale/de.json                                     |  42 ++
 locale/en.json                                     |  45 ++
 locale/es.json                                     |  40 ++
 locale/fi.json                                     |  45 ++
 locale/fr.json                                     |  39 ++
 locale/it.json                                     |  12 +
 locale/nl.json                                     |  44 ++
 locale/no.json                                     |  12 +
 locale/pt.json                                     |  12 +
 locale/ru.json                                     |  13 +
 locale/tr.json                                     |  13 +
 onionshare/__init__.py                             |  19 +
 onionshare/helpers.py                              | 123 +++++
 onionshare/index.html                              | 171 ++++---
 onionshare/onionshare.py                           | 529 +++++++++------------
 onionshare/socks.py                                | 504 ++++++++++++++++++++
 onionshare/strings.json                            | 165 -------
 onionshare/strings.py                              |  58 +++
 onionshare/web.py                                  | 218 +++++++++
 onionshare_gui/__init__.py                         |  19 +
 onionshare_gui/common.py                           |  36 ++
 onionshare_gui/downloads.py                        |  71 +++
 onionshare_gui/file_selection.py                   | 219 +++++++++
 onionshare_gui/onionshare_gui.py                   | 501 ++++++++-----------
 onionshare_gui/options.py                          |  48 ++
 onionshare_gui/server_status.py                    | 154 ++++++
 onionshare_gui/static/loader.gif                   | Bin 8980 -> 0 bytes
 ppa_release.sh                                     |  15 +
 screenshot.png                                     | Bin 129948 -> 0 bytes
 screenshot_receiver.png                            | Bin 0 -> 30570 bytes
 screenshot_sender.png                              | Bin 0 -> 18662 bytes
 setup.py                                           |  45 +-
 setup/onionshare-launcher.py                       |  21 +-
 setup/onionshare-osx.spec                          |  19 +-
 setup/onionshare-win.spec                          |  18 +
 setup/onionshare.nsi                               | 279 +++++++----
 tails/README.md                                    |   4 +-
 .../{build.sh => install_in_persistent_volume.sh}  |   2 +-
 test/onionshare_helpers_test.py                    |  33 ++
 test/onionshare_strings_test.py                    |  39 ++
 test/onionshare_test.py                            | 137 +-----
 test/onionshare_web_test.py                        |  35 ++
 test/test_helpers.py                               |  39 ++
 version                                            |   2 +-
 58 files changed, 2870 insertions(+), 1104 deletions(-)

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