summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-19 14:34:26 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-19 14:34:26 -0400
commit5ca3de21244d373f4c79b00d676f561dd50df4a9 (patch)
treee08bc52dc9240fa6aaed5f0754a94c7bed0ffc0a
parent9905289fe99382d20507adbc57e112729399eb42 (diff)
parent7260d07feec41a37d57e5e046d154760d569ecc6 (diff)
downloadtor-5ca3de21244d373f4c79b00d676f561dd50df4a9.tar.gz
tor-5ca3de21244d373f4c79b00d676f561dd50df4a9.zip
Merge branch 'maint-0.3.4' into release-0.3.4
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 6f774b2605..b0e66ccd26 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3517,12 +3517,14 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("Versioning authoritative dir servers must set "
"Recommended*Versions.");
+#ifdef HAVE_MODULE_DIRAUTH
char *t;
/* Call these functions to produce warnings only. */
t = format_recommended_version_list(options->RecommendedClientVersions, 1);
tor_free(t);
t = format_recommended_version_list(options->RecommendedServerVersions, 1);
tor_free(t);
+#endif
if (options->UseEntryGuards) {
log_info(LD_CONFIG, "Authoritative directory servers can't set "