commit 9eab75d36eaa42ae349aadf745e6f697f4d817c8 Merge: 34954f8 77f08d9 Author: Isis Lovecruft isis@torproject.org Date: Wed Aug 27 08:05:39 2014 +0000

Merge branch 'fix/9874-email' into develop

lib/bridgedb/test/test_smtp.py | 9 +++++++++ 1 file changed, 9 insertions(+)