diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-22 10:07:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-22 10:07:42 -0500 |
| commit | 60efce445b17d4b4153e91527887873812f5599f (patch) | |
| tree | 30129c34577653cac2a03d44712440c103b1a83d /src/or/dircollate.c | |
| parent | be6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea (diff) | |
| download | tor-60efce445b17d4b4153e91527887873812f5599f.tar.gz tor-60efce445b17d4b4153e91527887873812f5599f.zip | |
Enable ed25519 collator in voting.
Previously, I had left in some debugging code with /*XXX*/ after it,
which nobody noticed. Live and learn! Next time I will use /*XXX
DO NOT COMMIT*/ or something.
We need to define a new consensus method for this; consensus method
21 shouldn't actually be used.
Fixes bug 17702; bugfix on 0.2.7.2-alpha.
Diffstat (limited to 'src/or/dircollate.c')
| -rw-r--r-- | src/or/dircollate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dircollate.c b/src/or/dircollate.c index 4c812c40e6..f56aea8c64 100644 --- a/src/or/dircollate.c +++ b/src/or/dircollate.c @@ -159,7 +159,7 @@ dircollator_collate(dircollator_t *dc, int consensus_method) tor_assert(!dc->is_collated); dc->all_rsa_sha1_lst = smartlist_new(); - if (consensus_method < MIN_METHOD_FOR_ED25519_ID_VOTING + 10/*XXX*/) + if (consensus_method < MIN_METHOD_FOR_ED25519_ID_VOTING) dircollator_collate_by_rsa(dc); else dircollator_collate_by_ed25519(dc); |