commit 8ec29d7a7f09c979de79faa15302d25e7e95fe13 Merge: b8e307f 7e21184 Author: Isis Lovecruft isis@torproject.org Date: Tue Jan 28 17:24:12 2014 +0000

Merge branch 'fix/6127-simple-error-page' into develop

lib/bridgedb/HTTPServer.py | 87 +++++++++++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 21 deletions(-)