commit 043eec0e26977b1e6e0080405ab3ba354a6c945a Merge: 7c0ac12 a5b0f57 Author: Isis Lovecruft isis@torproject.org Date: Sat Oct 15 00:51:17 2016 +0000

Merge remote-tracking branch 'jschanck/269-alt-kdf'

proposals/269-hybrid-handshake.txt | 180 +++++++++++++++++++------------------ 1 file changed, 95 insertions(+), 85 deletions(-)