commit 9eca0869ffe25057f0e23bf39115945e70b2e68b Merge: 80a1331 a3bb0ec Author: Isis Lovecruft <isis@torproject.org> Date: Wed Mar 26 05:10:08 2014 +0000 Merge branch 'hotfix/11218-async-render' into develop Makefile | 4 +- lib/bridgedb/HTTPServer.py | 157 ++++++++++++++++++++++------------ lib/bridgedb/test/test_HTTPServer.py | 76 ++++++++++++---- 3 files changed, 167 insertions(+), 70 deletions(-)