diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-19 14:54:05 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-19 14:54:05 -0500 |
| commit | b0b0d6af6369f53caed2222837149dc4a90c739c (patch) | |
| tree | 89dede41d6101c26d17ceb5a52f1421a1e8b3c41 /src/or/dirvote.h | |
| parent | f2199763cf7c57744a885c12afcfa7b9df304629 (diff) | |
| parent | 699c39dada7f76d5b0cc8dd4b56df1fe4bba7763 (diff) | |
| download | tor-b0b0d6af6369f53caed2222837149dc4a90c739c.tar tor-b0b0d6af6369f53caed2222837149dc4a90c739c.tar.gz | |
Merge branch 'bug2286_unit_test_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 366b7cf03..fbb61b652 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -20,7 +20,7 @@ #define MIN_VOTE_INTERVAL 300 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 16 +#define MAX_SUPPORTED_CONSENSUS_METHOD 17 /** Lowest consensus method that contains a 'directory-footer' marker */ #define MIN_METHOD_FOR_FOOTER 9 @@ -52,6 +52,14 @@ * line */ #define MIN_METHOD_FOR_NTOR_KEY 16 +/** Lowest consensus method that ensures that authorities output an + * Unmeasured=1 flag for unmeasured bandwidths */ +#define MIN_METHOD_TO_CLIP_UNMEASURED_BW 17 + +/** Default bandwidth to clip unmeasured bandwidths to using method >= + * MIN_METHOD_TO_CLIP_UNMEASURED_BW */ +#define DEFAULT_MAX_UNMEASURED_BW 20 + void dirvote_free_all(void); /* vote manipulation */ |