summaryrefslogtreecommitdiff
path: root/src/feature/relay
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-07 10:44:10 +1000
committerteor <teor@torproject.org>2019-11-07 11:43:41 +1000
commitaaef9a2519d81c016bc1f58272121ed908fbff10 (patch)
tree720f3f62b2cada31b0f77b023288e9a498182d66 /src/feature/relay
parent57f43bcb03b6dafd3564b128f40e4d6713c91b8e (diff)
downloadtor-aaef9a2519d81c016bc1f58272121ed908fbff10.tar.gz
tor-aaef9a2519d81c016bc1f58272121ed908fbff10.zip
relay: Stop failing on startup when the relay module is disabled
When the relay module is disabled, make "ClientOnly 1" and "DirCache 0" by default. (But keep "ClientOnly 0" and "DirCache 1" as the defaults for the unit tests.) And run "make autostyle". Part of ticket 32410.
Diffstat (limited to 'src/feature/relay')
-rw-r--r--src/feature/relay/relay_config.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h
index 214f07efc2..5c36b43bd2 100644
--- a/src/feature/relay/relay_config.h
+++ b/src/feature/relay/relay_config.h
@@ -122,9 +122,6 @@ options_validate_relay_mode(const or_options_t *old_options,
return -1;
}
- /* 31851 / 29211: Set this option the correct way */
- options->ClientOnly = 1;
-
return 0;
}