commit 2b8b557c2bd3526029b2a09bb48ba95c9e20ff3e Merge: 3a3fe60 7e4a113 Author: Isis Lovecruft isis@torproject.org Date: Mon Feb 24 17:01:44 2014 +0000

Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop

bridgedb.conf | 3 +++ lib/bridgedb/HTTPServer.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)