commit 0275fa56cbd39c6f452cc973ac34d955f0ec6603 Merge: 33499da d68f8e2 Author: Isis Lovecruft isis@torproject.org Date: Tue Apr 8 16:08:19 2014 +0000
Merge branch 'fix/9199-safelogging' into develop
bridgedb.conf | 18 +- doc/sphinx/source/bridgedb.rst | 1 + doc/sphinx/source/bridgedb.safelog.rst | 9 + doc/sphinx/source/conf.py | 1 + lib/bridgedb/Bridges.py | 10 +- lib/bridgedb/Dist.py | 23 ++- lib/bridgedb/EmailServer.py | 24 +-- lib/bridgedb/HTTPServer.py | 15 +- lib/bridgedb/Main.py | 54 +---- lib/bridgedb/parse/addr.py | 14 +- lib/bridgedb/safelog.py | 197 +++++++++++++++++++ lib/bridgedb/test/test_safelog.py | 336 ++++++++++++++++++++++++++++++++ lib/bridgedb/util.py | 201 ++++++++++++++++++- 13 files changed, 806 insertions(+), 97 deletions(-)