[tor-commits] [torspec/master] Merge remote-tracking branch 'public/ed25519_voting_again'

[nickm at torproject.org]

commit a5d0978a833a610d5f1ed4f5424eca563deba65e
Merge: 2a9f49b 313eff6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 13:28:17 2016 -0400

    Merge remote-tracking branch 'public/ed25519_voting_again'

 dir-spec.txt | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 11 deletions(-)