diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-06-02 02:17:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-06-02 02:17:28 -0400 |
| commit | dd0745d0663ed1988d159f1ef105df424f10c54a (patch) | |
| tree | 3864b9a07209a373b5ea7ca798ad048b133e106a | |
| parent | 723894f114ef091ba09e3ab7440d4339bbc21430 (diff) | |
| download | tor-dd0745d0663ed1988d159f1ef105df424f10c54a.tar tor-dd0745d0663ed1988d159f1ef105df424f10c54a.tar.gz | |
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.
| -rw-r--r-- | changes/bug10405 | 4 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug10405 b/changes/bug10405 new file mode 100644 index 000000000..46a0746fd --- /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 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 |