diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-04 11:43:11 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-04 11:43:11 -0500 |
| commit | f50d64b62eeb7c07f2e0dd7f23499880d208a434 (patch) | |
| tree | 570acef7b146b40d140a5d7420c274b1286d7a49 /src/or/dirvote.h | |
| parent | cf3da63b9023875e93c05d30fb6d76e047bebe70 (diff) | |
| parent | a2c09f67512e79ed2c714e698c0234b7c8fad8a9 (diff) | |
| download | tor-f50d64b62eeb7c07f2e0dd7f23499880d208a434.tar.gz tor-f50d64b62eeb7c07f2e0dd7f23499880d208a434.zip | |
Merge branch 'bug23826-23828_squashed'
Diffstat (limited to 'src/or/dirvote.h')
| -rw-r--r-- | src/or/dirvote.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 72a35fea6d..c9cb527788 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -51,11 +51,15 @@ #define MIN_VOTE_INTERVAL_TESTING_INITIAL \ ((MIN_VOTE_SECONDS_TESTING)+(MIN_DIST_SECONDS_TESTING)+1) +/* A placeholder for routerstatus_format_entry() when the consensus method + * argument is not applicable. */ +#define ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD 0 + /** The lowest consensus method that we currently support. */ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 26 +#define MAX_SUPPORTED_CONSENSUS_METHOD 28 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -115,6 +119,14 @@ * instead of 0. See #14881 */ #define MIN_METHOD_FOR_INIT_BW_WEIGHTS_ONE 26 +/** Lowest consensus method where the microdesc consensus contains relay IPv6 + * addresses. See #23826 and #20916. */ +#define MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS 27 + +/** Lowest consensus method where microdescriptors do not contain relay IPv6 + * addresses. See #23828 and #20916. */ +#define MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC 28 + /** 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.) */ |