commit c0701916570b0e1c7fd314c41a45b69f71846d14 Merge: b185241 27ffc9c Author: Isis Lovecruft isis@torproject.org Date: Sat Jul 26 02:45:03 2014 +0000

Merge branch 'fix/12635-tbb-dl-links' into develop

lib/bridgedb/strings.py | 2 +- lib/bridgedb/templates/bridges.html | 2 +- lib/bridgedb/templates/howto.html | 2 +- lib/bridgedb/templates/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)