diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-23 08:26:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-23 08:26:44 -0400 |
| commit | b3112a6d26d4f142e3007994ce8da6d7517287bb (patch) | |
| tree | fd555d9408056d22ce467e22a08ffc83a9b555c7 /src/feature/dirauth/dirvote.h | |
| parent | 9cd20e82763af43424085cf651dd4b08e69967e1 (diff) | |
| parent | 8763d96d20f33ca7367effb77fb5d7ab30c39766 (diff) | |
| download | tor-b3112a6d26d4f142e3007994ce8da6d7517287bb.tar.gz tor-b3112a6d26d4f142e3007994ce8da6d7517287bb.zip | |
Merge branch 'remove-padding-fix-7869-v2'
Diffstat (limited to 'src/feature/dirauth/dirvote.h')
| -rw-r--r-- | src/feature/dirauth/dirvote.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 1b1c9f2cc7..9cc87489b4 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -53,7 +53,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 28 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 29 +#define MAX_SUPPORTED_CONSENSUS_METHOD 30 /** * Lowest consensus method where microdescriptor lines are put in canonical @@ -61,6 +61,10 @@ **/ #define MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS 29 +/** Lowest consensus method where an unpadded base64 onion-key-ntor is allowed + * See #7869 */ +#define MIN_METHOD_FOR_UNPADDED_NTOR_KEY 30 + /** 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.) */ |