sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Nick Mathewson 2014-06-02 02:17:28 -04:00
parent 723894f114
commit dd0745d066
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug10405 Normal file
View File

@ -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.

2
src/or/main.c
View File

@ -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