diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-13 10:03:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-05-28 10:42:29 -0400 |
| commit | d4a6b1a4209f0b3995c0f61ad9cbe687e09a6fb0 (patch) | |
| tree | ec37cd2cf0e293508cbacbe4fd782a12c8aa5cdf /src/or/dirvote.c | |
| parent | 6c564e6c081514bab56bacec89b1f6f9457a7022 (diff) | |
| download | tor-d4a6b1a4209f0b3995c0f61ad9cbe687e09a6fb0.tar.gz tor-d4a6b1a4209f0b3995c0f61ad9cbe687e09a6fb0.zip | |
Implement ed25519 identity collation for voting.
This is a new collator type that follows proposal 220 for deciding
which identities to include. The rule is (approximately):
If a <ed,rsa> identity is listed by more than half of authorities,
include it. And include all <rsa> votes about that node as
matching.
Otherwise, if an <*,rsa> or <rsa> identity is listed by more than
half of the authorities, and no <ed,rsa> has been listed, include
it.
Diffstat (limited to 'src/or/dirvote.c')
| -rw-r--r-- | src/or/dirvote.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 6a70c13377..549dec1131 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1502,7 +1502,7 @@ networkstatus_compute_consensus(smartlist_t *votes, dircollator_add_vote(collator, v); } SMARTLIST_FOREACH_END(v); - dircollator_collate(collator); + dircollator_collate(collator, consensus_method); /* Now go through all the votes */ flag_counts = tor_calloc(smartlist_len(flags), sizeof(int)); |