summaryrefslogtreecommitdiff
path: root/src/or/dirvote.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-09 14:31:51 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-22 20:00:47 -0400
commit69347f48e00ae31222ce10d66c507293954e4fcc (patch)
tree856ec690cb3055ed9d4a3fb931f10af0e2b63d6e /src/or/dirvote.c
parente58555135a11e1c78b130cb4807d5dc1d1dfe97b (diff)
downloadtor-69347f48e00ae31222ce10d66c507293954e4fcc.tar.gz
tor-69347f48e00ae31222ce10d66c507293954e4fcc.zip
Disable consensus methods before 25.
Consensus method 25 is the oldest one supported by any stable version of 0.2.9, which is our current most-recent LTS. Thus, by proposal 290, they should be removed. This commit does not actually remove the code to implement these methods: it only makes it so authorities will no longer support them. I'll remove the backend code for them in later commits.
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r--src/or/dirvote.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index c3cd0d3cd1..2657155054 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -3951,13 +3951,7 @@ static const struct consensus_method_range_t {
int low;
int high;
} microdesc_consensus_methods[] = {
- {MIN_SUPPORTED_CONSENSUS_METHOD, MIN_METHOD_FOR_A_LINES - 1},
- {MIN_METHOD_FOR_A_LINES, MIN_METHOD_FOR_P6_LINES - 1},
- {MIN_METHOD_FOR_P6_LINES, MIN_METHOD_FOR_NTOR_KEY - 1},
- {MIN_METHOD_FOR_NTOR_KEY, MIN_METHOD_FOR_ID_HASH_IN_MD - 1},
- {MIN_METHOD_FOR_ID_HASH_IN_MD, MIN_METHOD_FOR_ED25519_ID_IN_MD - 1},
- {MIN_METHOD_FOR_ED25519_ID_IN_MD,
- MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC - 1},
+ {MIN_SUPPORTED_CONSENSUS_METHOD, MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC - 1},
{MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC, MAX_SUPPORTED_CONSENSUS_METHOD},
{-1, -1}
};