commit dd0745d0663ed1988d159f1ef105df424f10c54a Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 2 02:17:28 2014 -0400

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. --- changes/bug10405 | 4 ++++ src/or/main.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug10405 b/changes/bug10405 new file mode 100644 index 0000000..46a0746 --- /dev/null +++ b/changes/bug10405 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid "Tried to open a socket with DisableNetwork set" warnings + when starting a bridge client without bridge descriptors. Fixes + bug 10405; bugfix on 0.2.3.9-alpha. diff --git a/src/or/main.c b/src/or/main.c index a3be9a2..3c661cd 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