From dd0745d0663ed1988d159f1ef105df424f10c54a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 2 Jun 2014 02:17:28 -0400 Subject: Don't try to fetch bridge descriptors when DisableNetwork is set Patch from Roger; changes file by me. Fixes 10405; bugfix on 0.2.3.9-alpha, where DisableNetwork was introduced. --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/or') diff --git a/src/or/main.c b/src/or/main.c index a3be9a20d..3c661cd12 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1247,7 +1247,7 @@ run_scheduled_events(time_t now) now + DESCRIPTOR_FAILURE_RESET_INTERVAL; } - if (options->UseBridges) + if (options->UseBridges && !options->DisableNetwork) fetch_bridge_descriptors(options, now); /* 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our -- cgit v1.2.3