commit b2ef9342e6734d4e3d0a2c8e943c68cf0da419d8 Merge: c6d5278 7e79bc0 Author: Isis Lovecruft <isis@torproject.org> Date: Thu Jan 8 14:08:29 2015 +0000 Merge branch 'fix/13123-bridgeline-spaces' into develop lib/bridgedb/HTTPServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)