commit ff4e39ed6f4c68664be5d521b72a151ffdc11073 Merge: 5c646aa d23599a Author: Isis Lovecruft <isis@torproject.org> Date: Sun Jan 12 02:01:13 2014 +0000 Merge branch 'fix/6127-web-server-tracebacks' into develop lib/bridgedb/HTTPServer.py | 65 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 7 deletions(-)