aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-23 11:07:52 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-23 11:07:52 -0400
commit66833311eb5bf717c55637093ec769588a54c11e (patch)
treeaeaa50fc3966bf1dc8fffd6ede7d67ed24e4df8c /src
parent830492fbdaef92ecf82c5bfde9373a2a2d9157d3 (diff)
parentd01cf18ecbb02bca7e4168b28f28d8b84f03da70 (diff)
downloadtor-66833311eb5bf717c55637093ec769588a54c11e.tar
tor-66833311eb5bf717c55637093ec769588a54c11e.tar.gz
Merge remote-tracking branch 'public/bug11200'
Diffstat (limited to 'src')
-rw-r--r--src/or/networkstatus.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index b8ac2e05f..ef450073e 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) {