[tor-commits] [gettor/master] Merge branch 'develop' of ssh://git-rw.torproject.org/user/ilv/gettor

[ilv at torproject.org]

commit bbae1134ffb3403e88d9b5d1ade9d8cd52e3f994
Merge: 58f01df 652639e
Author: ilv <ilv at users.noreply.github.com>
Date:   Sat Oct 31 16:14:59 2015 -0300

    Merge branch 'develop' of ssh://git-rw.torproject.org/user/ilv/gettor

 get_mirrors.py                                     |  353 ++++
 gettor/blacklist.py                                |  110 +-
 gettor/core.py                                     |  325 ++-
 gettor/db.py                                       |   81 +-
 gettor/smtp.py                                     |  256 ++-
 gettor/twitter.py                                  |  304 +++
 gettor/utils.py                                    |   19 +
 gettor/xmpp.py                                     |  200 +-
 lang/core/i18n/en/en.po                            |    9 -
 lang/smtp/i18n/en/LC_MESSAGES/en.po                |   23 +-
 lang/xmpp/i18n/en/LC_MESSAGES/en.po                |   72 +-
 mirrors-list.txt                                   |   58 +
 process_chat.py                                    |   22 +
 process_email.py                                   |   41 +
 process_tweets.py                                  |   22 +
 providers/drive.links                              |   31 +-
 providers/dropbox.links                            |   31 +-
 providers/github.links                             |   29 +-
 smtp.cfg                                           |    3 +-
 smtp_demo.py                                       |   22 -
 tor-mirrors                                        | 2187 ++++++++++++++++++++
 tor-mirrors.csv                                    |  116 ++
 upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg         |    1 -
 upload/4.0.3/TorBrowser-4.0.3-osx32_en.dmg.asc     |    1 -
 upload/4.0.3/sha256sums.txt                        |    1 -
 upload/4.0.3/test_file.txt                         |    1 -
 upload/4.0.3/tor-browser-linux32-4.0.3_en.tar.xz   |    1 -
 .../4.0.3/tor-browser-linux32-4.0.3_en.tar.xz.asc  |    1 -
 upload/4.0.3/tor-browser-linux64-4.0.3_en.tar.xz   |    1 -
 .../4.0.3/tor-browser-linux64-4.0.3_en.tar.xz.asc  |    1 -
 upload/4.0.3/torbrowser-install-4.0.3_ar.exe       |    1 -
 upload/4.0.3/torbrowser-install-4.0.3_ar.exe.asc   |    1 -
 upload/bundles2drive.py                            |  180 +-
 upload/bundles2github.py                           |   60 +-
 xmpp.cfg                                           |    2 +
 xmpp_demo.py                                       |    7 -
 36 files changed, 4035 insertions(+), 538 deletions(-)