diff options
| -rw-r--r-- | changes/bug11200 | 5 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/changes/bug11200 b/changes/bug11200 new file mode 100644 index 0000000000..b4b61c9b7c --- /dev/null +++ b/changes/bug11200 @@ -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. diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 49478a7341..1819c4ef71 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -898,6 +898,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) { |