diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-23 00:18:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-23 00:18:11 -0400 |
| commit | f2c6c5e69c5accb62b8a19839fd6b2defd470919 (patch) | |
| tree | aa72fae3337a973928c1715b05d7e3ce030bb133 /src | |
| parent | a53e9bfeb407c1d79a3858d0b4c29cec0fa08f98 (diff) | |
| parent | a4b447604a914cedc0b85efa6e33eb1feba0443a (diff) | |
| download | tor-f2c6c5e69c5accb62b8a19839fd6b2defd470919.tar.gz tor-f2c6c5e69c5accb62b8a19839fd6b2defd470919.zip | |
Merge branch 'ticket11149'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/dirserv.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 984b47d2f5..7393a80ad3 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -393,13 +393,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")) { @@ -408,6 +410,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) { |