commit 9e1d438988b42bdd4a6801f4c509ad1f45b11bdb
Merge: 50286fa ceac2ff
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date: Tue Mar 31 05:43:27 2015 +0000
Merge branch 'fix/1839-rotation-periods' into develop
bridgedb.conf | 32 ++++++++++++++
lib/bridgedb/HTTPServer.py | 15 ++++---
lib/bridgedb/Main.py | 8 +---
lib/bridgedb/captcha.py | 2 +-
lib/bridgedb/configure.py | 4 ++
lib/bridgedb/email/server.py | 12 ++++--
lib/bridgedb/schedule.py | 14 +++---
lib/bridgedb/test/email_helpers.py | 3 ++
lib/bridgedb/test/test_HTTPServer.py | 2 +-
lib/bridgedb/test/test_email_server.py | 2 +-
lib/bridgedb/test/test_schedule.py | 74 ++++++++++++++++----------------
11 files changed, 107 insertions(+), 61 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits