commit 6875e46d4cc6ed552bb8120bcabaeceb26d0cab8 Merge: 0315657 25ea46b Author: Isis Lovecruft <isis@torproject.org> Date: Mon Oct 14 22:25:55 2013 +0000 Merge branch 'hotfix/3573-robots-txt_add-web-resource' into develop lib/bridgedb/HTTPServer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)