commit 522961f1dd2e58320237df7ea4e3e100bf7d2eb4 Merge: 5e1afa3 28ea3c4 Author: Isis Lovecruft isis@torproject.org Date: Fri May 8 23:40:30 2015 +0000

Merge branch 'hotfix/0.3.2-format-plain-bytes' into develop

lib/bridgedb/HTTPServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)