commit f5230149ea962a652512440f29ccd1d2fbf233a4 Merge: d40b410 45876ea Author: Isis Lovecruft isis@torproject.org Date: Mon Mar 17 00:36:44 2014 +0000

Merge branch 'fix/11218-deferred-solution-isvalid' into develop

lib/bridgedb/HTTPServer.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)