[tor-commits] [torspec/master] Merge branch '220_evolution'

[nickm at torproject.org]

commit d57bfea27213d839e77c17882df4bb168e13ecc3
Merge: 773f0ae 3e32886
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 7 11:37:43 2014 -0500

    Merge branch '220_evolution'
    
    This branch reflects changes I've needed to make in proposals 220 and
    228 to reflect what's sensible or implementable (as far as I've found
    while implementing them).

 proposals/220-ecc-id-keys.txt                   |   95 +++++++++++++----------
 proposals/228-cross-certification-onionkeys.txt |   15 ++++
 2 files changed, 71 insertions(+), 39 deletions(-)