[tor-commits] [bridgedb/develop] Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop

[isis at torproject.org]

commit bd5866b65fa670b41e96672325e8540e32286012
Merge: be58b8f 4e3aa2d
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 6 20:21:17 2015 +0000

    Merge remote-tracking branch 'rr/2015-03-23-01-fix-strip-abuse' into develop

 lib/bridgedb/Bridges.py                       |    3 ++-
 lib/bridgedb/bridges.py                       |    6 ++++--
 lib/bridgedb/parse/addr.py                    |    8 ++------
 lib/bridgedb/test/legacy_Tests.py             |    9 ++-------
 lib/bridgedb/test/test_Main.py                |    3 ++-
 lib/bridgedb/test/test_Tests.py               |    3 ++-
 lib/bridgedb/test/test_bridgedb.py            |    3 ++-
 lib/bridgedb/test/test_captcha.py             |    7 ++++---
 lib/bridgedb/test/test_configure.py           |    3 ++-
 lib/bridgedb/test/test_crypto.py              |    3 ++-
 lib/bridgedb/test/test_email_autoresponder.py |    3 ++-
 lib/bridgedb/test/test_https.py               |    3 ++-
 lib/bridgedb/test/test_parse_addr.py          |    2 +-
 lib/bridgedb/test/test_smtp.py                |    3 ++-
 lib/bridgedb/util.py                          |    9 +++++++++
 15 files changed, 40 insertions(+), 28 deletions(-)