commit b8e307f7189a64b1db01888655a81b16e3c67ba3 Merge: b52786f ca1544c Author: Isis Lovecruft isis@torproject.org Date: Tue Jan 28 16:53:07 2014 +0000

Merge branch 'fix/10737-post-args-redirects' into develop

lib/bridgedb/HTTPServer.py | 58 ++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 16 deletions(-)