summaryrefslogtreecommitdiff
path: root/src/or/dircollate.h
AgeCommit message (Collapse)Author
2016-03-21Merge branch 'maint-0.2.7'Nick Mathewson
2016-03-21Document dircollate.c (and remove an unused global)Nick Mathewson
2016-02-27Update the copyright year.Nick Mathewson
2015-06-01Appease make check-spacesAndrea Shepard
2015-05-28Implement ed25519 identity collation for voting.Nick Mathewson
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.
2015-05-28Refactor code that matches up routers with the same identity in votesNick Mathewson
This makes 'routerstatus collation' into a first-class concept, so we can change how that works for prop220.