Merge branch 'maint-0.3.4'

This commit is contained in:
Nick Mathewson 2018-07-19 14:34:26 -04:00
commit 3c49019016

View file

@ -3545,12 +3545,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 "