diff options
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/config.c | 1 | ||||
-rw-r--r-- | src/or/dirserv.c | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index a54a892e4..da6aec0c1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1353,7 +1353,6 @@ options_act(const or_options_t *old_options) "to collect statistics about its clients that use pluggable " "transports. Please enable it using the ExtORPort torrc option " "(e.g. set 'ExtORPort auto')."); - } if (options->SafeLogging_ != SAFELOG_SCRUB_ALL && diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d03afe037..234209d21 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -374,13 +374,15 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, strmap_size(fingerprint_list->fp_by_name), digestmap_size(fingerprint_list->status_by_digest)); - /* Versions before Tor 0.2.2.35 have known security issues that - * make them unsuitable for the current network. */ - if (platform && !tor_version_as_new_as(platform,"0.2.2.35")) { + /* Versions before Tor 0.2.3.25 are too old to support, and aren't + * getting any more security fixes. Disable them. */ + if (platform && !tor_version_as_new_as(platform,"0.2.3.25")) { if (msg) *msg = "Tor version is insecure or unsupported. Please upgrade!"; return FP_REJECT; - } else if (platform && tor_version_as_new_as(platform,"0.2.3.0-alpha")) { + } +#if 0 + else if (platform && tor_version_as_new_as(platform,"0.2.3.0-alpha")) { /* Versions from 0.2.3-alpha...0.2.3.9-alpha have known security * issues that make them unusable for the current network */ if (!tor_version_as_new_as(platform, "0.2.3.10-alpha")) { @@ -389,6 +391,7 @@ dirserv_get_status_impl(const char *id_digest, const char *nickname, return FP_REJECT; } } +#endif result = dirserv_get_name_status(id_digest, nickname); if (result & FP_NAMED) { |