diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-26 11:00:08 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-26 11:00:08 -0700 |
| commit | 97337844b7282946dda12f59bcabc097fad42647 (patch) | |
| tree | 4ab018e139937eadfe79778f1c3e2f8fc2068e68 /src/or/dirvote.h | |
| parent | a633baf6320291b6f3de15557438682ed7fe2eaa (diff) | |
| parent | 501fc3bbc6e6e4003c99b0bfd95deb06b2df9580 (diff) | |
| download | tor-97337844b7282946dda12f59bcabc097fad42647.tar.gz tor-97337844b7282946dda12f59bcabc097fad42647.zip | |
Merge branch 'protover_v2_squashed'
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 06bfe671bd..efd233ef5f 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 24 +#define MAX_SUPPORTED_CONSENSUS_METHOD 25 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -103,6 +103,14 @@ * the Valid flag. */ #define MIN_METHOD_FOR_EXCLUDING_INVALID_NODES 24 +/** Lowest consensus method where authorities vote on required/recommended + * protocols. */ +#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 25 + +/** Lowest consensus method where authorities add protocols to routerstatus + * entries. */ +#define MIN_METHOD_FOR_RS_PROTOCOLS 25 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */ |