commit cfc4f270515b21f2ac6539390a0f0403f89fee8b Merge: f6f897c a265198 Author: Isis Lovecruft <isis@torproject.org> Date: Fri Jul 22 11:49:52 2016 +0000 Merge branch 'draft/hybrid-handshake' proposals/000-index.txt | 6 +- proposals/263-ntru-for-pq-handshake.txt | 5 +- proposals/269-hybrid-handshake.txt | 412 ++++++++++++++++++++++++++++++++ proposals/proposal-status.txt | 5 + 4 files changed, 425 insertions(+), 3 deletions(-)