[tor-commits] [bridgedb/master] Merge remote-tracking branch 'rr/2015-04-30-03-security-fixes' into develop

[isis at torproject.org]

commit 4fb9962bf80c5693937e83079b3083220431b11d
Merge: 9a4cf49 44e3190
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed May 6 20:25:45 2015 +0000

    Merge remote-tracking branch 'rr/2015-04-30-03-security-fixes' into develop

 lib/bridgedb/HTTPServer.py          |    4 ++-
 lib/bridgedb/bridges.py             |   45 ++++++++++++++++++++++++++++
 lib/bridgedb/templates/bridges.html |    5 ++--
 lib/bridgedb/util.py                |   55 +++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 3 deletions(-)