diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-23 11:07:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-23 11:07:52 -0400 |
| commit | 66833311eb5bf717c55637093ec769588a54c11e (patch) | |
| tree | aeaa50fc3966bf1dc8fffd6ede7d67ed24e4df8c | |
| parent | 830492fbdaef92ecf82c5bfde9373a2a2d9157d3 (diff) | |
| parent | d01cf18ecbb02bca7e4168b28f28d8b84f03da70 (diff) | |
| download | tor-66833311eb5bf717c55637093ec769588a54c11e.tar.gz tor-66833311eb5bf717c55637093ec769588a54c11e.zip | |
Merge remote-tracking branch 'public/bug11200'
| -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 b8ac2e05fb..ef450073e7 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -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) { |