[tor-commits] [torspec/master] Merge branch 'newcrypto'

[nickm at torproject.org]

commit 7a8bcfeed2c59933b42a75da4662936fa5114e15
Merge: 075e215 2fcc5ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 31 21:24:50 2011 -0400

    Merge branch 'newcrypto'

 proposals/ideas/xxx-new-crypto-sketch.txt |  766 +++++++++++++++++++++++++++++
 proposals/ideas/xxx-ntor-handshake.txt    |   17 +-
 2 files changed, 779 insertions(+), 4 deletions(-)