[tor-commits] [gettor/master] Merge branch 'develop'

[ilv at torproject.org]

commit 977bc9ef248ac581f2f5f34ed59a7796fe9e2dbc
Merge: b1a11bd f6ed228
Author: ilv <ilv at users.noreply.github.com>
Date:   Fri Dec 4 15:23:14 2015 -0300

    Merge branch 'develop'

 gettor/core.py       |   11 -----------
 gettor/smtp.py       |   38 +++++++-------------------------------
 gettor/twitter.py    |   48 +++++++++++++++++-------------------------------
 gettor/utils.py      |   15 +++++++++------
 gettor/xmpp.py       |   25 +++++--------------------
 log/smtp.log         |    6 ++++++
 scripts/create_db.py |   17 +++++++++--------
 7 files changed, 53 insertions(+), 107 deletions(-)