diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-18 15:01:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-18 15:01:03 -0400 |
| commit | a321d72401348cc3c8a5c3e86b2506c5c2278acd (patch) | |
| tree | bd3c52d879ab0279b8144ca650874dc50d57af3a /src/or/config.c | |
| parent | 6dafddd05dcbf65626d7cff2250955d8799e975d (diff) | |
| parent | fd5dce0a1b84fbf2efe2e77bd999eba23a81c61e (diff) | |
| download | tor-a321d72401348cc3c8a5c3e86b2506c5c2278acd.tar.gz tor-a321d72401348cc3c8a5c3e86b2506c5c2278acd.zip | |
Merge branch 'bug26485_029_squashed' into maint-0.2.9
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 75e4065859..810f1e9a7a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3098,6 +3098,14 @@ options_validate(or_options_t *old_options, or_options_t *options, !options->RecommendedServerVersions)) REJECT("Versioning authoritative dir servers must set " "Recommended*Versions."); + + 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); + if (options->UseEntryGuards) { log_info(LD_CONFIG, "Authoritative directory servers can't set " "UseEntryGuards. Disabling."); @@ -8003,4 +8011,3 @@ init_cookie_authentication(const char *fname, const char *header, tor_free(cookie_file_str); return retval; } - |