commit 6b31a5203ef087e700223bc6e765cde1387b5e94 Author: Isis Lovecruft isis@torproject.org Date: Tue Dec 10 12:43:32 2013 +0000

Add Main.load() call back in, removed in 31b12521 --- lib/bridgedb/Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index c2ced50..8e8179b 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -500,7 +500,7 @@ def startup(options): logging.debug("Saving state again before reparsing descriptors...") state.save() logging.info("Reparsing bridge descriptors...") - reactor.callInThread(load, state, splitter, clear=False) + load(state, splitter, clear=False)

state = persistent.load() logging.info("Bridges loaded: %d" % len(splitter))