diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-18 15:03:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-18 15:03:27 -0400 |
| commit | 559f79fd79b7c22caac2888f82e92307be02904a (patch) | |
| tree | 47ffacb2d47ce8dbe0c9dfc997520190e31489ad /src/or/config.c | |
| parent | 61a2762e353f29b8b4402bf068e6268809174702 (diff) | |
| parent | a321d72401348cc3c8a5c3e86b2506c5c2278acd (diff) | |
| download | tor-559f79fd79b7c22caac2888f82e92307be02904a.tar.gz tor-559f79fd79b7c22caac2888f82e92307be02904a.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.2
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 79cfcb4111..8f4b5ab5a1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3295,6 +3295,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."); @@ -8278,4 +8286,3 @@ init_cookie_authentication(const char *fname, const char *header, tor_free(cookie_file_str); return retval; } - |