6 Commits

Author	SHA1	Message	Date
Nick Mathewson	6a91cab79c	Merge branch 'maint-0.2.7'	2016-03-21 13:26:04 -04:00
Nick Mathewson	6182e34628	Document dircollate.c (and remove an unused global)	2016-03-21 13:23:32 -04:00
Nick Mathewson	57699de005	Update the copyright year.	2016-02-27 18:48:19 +01:00
Andrea Shepard	0e0b65db4f	Appease make check-spaces	2015-06-01 12:59:14 +00:00
Nick Mathewson	d4a6b1a420	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.	2015-05-28 10:42:29 -04:00
Nick Mathewson	6c564e6c08	Refactor code that matches up routers with the same identity in votes ... This makes 'routerstatus collation' into a first-class concept, so we can change how that works for prop220.	2015-05-28 10:42:29 -04:00