commit 336eb6250df6bf53f0390e95b2fde9a30ac1b1cf Merge: 99cbe98 aa2885b Author: Isis Lovecruft isis@torproject.org Date: Fri Jan 24 20:20:39 2014 +0000

Merge branch 'fix/6127-render_GET-traceback' into develop

lib/bridgedb/HTTPServer.py | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)