aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirvote.h
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2016-05-03 11:21:17 -0400
committerDavid Goulet <dgoulet@torproject.org>2016-07-01 13:25:03 -0400
commitca6ceec112f05ce68097429089ee428010c8b8d0 (patch)
treea297cc544c7f354a458a1712d7e2d101fcb6aa0b /src/or/dirvote.h
parent5b183328fdd4bf81a3a38afe88d2766e61773fb9 (diff)
downloadtor-ca6ceec112f05ce68097429089ee428010c8b8d0.tar.gz
tor-ca6ceec112f05ce68097429089ee428010c8b8d0.zip
prop250: Put commits and SRVs in votes/consensus
This commit adds the commit(s) line in the vote as well as the SR values. It also has the mechanism to add the majority SRVs in the consensus. Signed-off-by: George Kadianakis <desnacked@riseup.net> Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/dirvote.h')
-rw-r--r--src/or/dirvote.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index f2080a522e..4c563aa5b2 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 22
+#define MAX_SUPPORTED_CONSENSUS_METHOD 23
/** Lowest consensus method where microdesc consensuses omit any entry
* with no microdesc. */
@@ -90,10 +90,15 @@
* 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 22
+/** Lowest consensus method where authorities may include a shared random
+ * value(s). */
+#define MIN_METHOD_FOR_SHARED_RANDOM 23
+
/** 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.) */