diff options
Diffstat (limited to 'src/or/dircollate.c')
| -rw-r--r-- | src/or/dircollate.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/or/dircollate.c b/src/or/dircollate.c index 43cf27f489..3f9d78f02d 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -1,6 +1,6 @@ /* Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2014, The Tor Project, Inc. */ + * Copyright (c) 2007-2016, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** @@ -34,7 +34,8 @@ ddmap_entry_free(ddmap_entry_t *e) tor_free(e); } -/** Return a new empty ddmap_entry, with <b>n_votes</b> elements in vrs_list. */ +/** Return a new empty ddmap_entry, with <b>n_votes</b> elements in + * vrs_list. */ static ddmap_entry_t * ddmap_entry_new(int n_votes) { @@ -225,12 +226,12 @@ dircollator_collate_by_rsa(dircollator_t *dc) * entry in <b>dc</b> by ed25519 key and by RSA key. * * The rule is, approximately: - * If a <ed,rsa> identity is listed by more than half of authorities, - * include it. And include all <rsa>-only votes about that node as + * If a (ed,rsa) identity is listed by more than half of authorities, + * include it. And include all (rsa)-only 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> pair for the same RSA key + * Otherwise, if an (*,rsa) or (rsa) identity is listed by more than + * half of the authorities, and no (ed,rsa) pair for the same RSA key * has been already been included based on the rule above, include * that RSA identity. */ |