commit 44b14aaa1e39829d6bfab5b20000517293ff925e Merge: b0ac1b5 e829417 Author: Isis Lovecruft isis@torproject.org Date: Thu May 1 01:04:43 2014 +0000

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

lib/bridgedb/EmailServer.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)