[tor-commits] [bridgedb/master] Merge branch 'fix/9874-email' into develop

[isis at torproject.org]

commit ef6a5e4fdf4b890a4bdd2c412e20b4e72fa0fa07
Merge: f565959 cc2ea62
Author: Isis Lovecruft <isis at torproject.org>
Date:   Tue Aug 12 23:45:16 2014 +0000

    Merge branch 'fix/9874-email' into develop

 .travis.yml                    |    5 ++
 lib/bridgedb/test/test_smtp.py |  165 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)