nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug11200'

Browse Source
This commit is contained in:
Nick Mathewson 2014-04-23 11:07:52 -04:00
commit 66833311eb
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug11200 Normal file
View File

@ -0,0 +1,5 @@
- Minor bugfixes:
- Avoid generating spurious warnings and failure messages when
starting with DisableNetwork enabled. Fixes bug 11200 and bug
10405; bugfix on 0.2.3.9-alpha.

8
src/or/networkstatus.c
View File

@ -909,6 +909,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out)
*msg_out = NULL;
}
if (options->DisableNetwork) {
if (msg_out) {
*msg_out = "DisableNetwork is set.";
}
log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)");
return 1;
}
if (options->UseBridges) {
if (!any_bridge_descriptors_known()) {
if (msg_out) {