diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-03-21 13:25:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-03-21 13:25:12 -0400 |
| commit | e1e62f9d5735da64dc1435d3a40db77f6229766a (patch) | |
| tree | 70654c50b0e9d80c855f3a9868ad3c4a15c53235 /src/or/dirvote.h | |
| parent | 920e3d6a191486a5879aa0f2e0bfcf743d075c12 (diff) | |
| parent | 2f2fba8a918674b7187a5b497bb156b79aaec4e1 (diff) | |
| download | tor-e1e62f9d5735da64dc1435d3a40db77f6229766a.tar.gz tor-e1e62f9d5735da64dc1435d3a40db77f6229766a.zip | |
Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index dca8540870..50c2496bb0 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -55,7 +55,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 21 +#define MAX_SUPPORTED_CONSENSUS_METHOD 22 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -87,11 +87,12 @@ #define MIN_METHOD_FOR_GUARDFRACTION 20 /** Lowest consensus method where authorities may include an "id" line for - * ed25519 identities in microdescriptors. */ + * ed25519 identities in microdescriptors. (Broken; see + * consensus_method_is_supported() for more info.) */ #define MIN_METHOD_FOR_ED25519_ID_IN_MD 21 /** Lowest consensus method where authorities vote on ed25519 ids and ensure * ed25519 id consistency. */ -#define MIN_METHOD_FOR_ED25519_ID_VOTING MIN_METHOD_FOR_ED25519_ID_IN_MD +#define MIN_METHOD_FOR_ED25519_ID_VOTING 22 /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not |