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

[isis at torproject.org]

commit 9729bd102a81bba3cddfaf51526e99610b2f3cf5
Merge: 0075c56 82f4654
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Aug 27 05:54:39 2014 +0000

    Merge branch 'fix/9874-email' into develop

 lib/bridgedb/test/test_smtp.py |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)