[tor-commits] [bridgedb/master] Merge branch 'fix/11664-email-buffer-interface'

[isis at torproject.org]

commit 8316a92ce1837cba385a01aa11f93dd8b394d422
Merge: b758227 e829417
Author: Isis Lovecruft <isis at torproject.org>
Date:   Thu May 1 01:03:35 2014 +0000

    Merge branch 'fix/11664-email-buffer-interface'

 lib/bridgedb/EmailServer.py |   19 +++++++++++++------
 lib/bridgedb/crypto.py      |   27 +++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 8 deletions(-)