commit 64b6b72de4bde167832c58aa8d0cbeba4c8c8e77 Merge: cfc4f27 9d8408a Author: Isis Lovecruft <isis@torproject.org> Date: Fri Jul 22 11:57:10 2016 +0000 Merge branch 'draft/newhope' proposals/XXX-newhope-hybrid-handshake.txt | 764 +++++++++++++++++++++++++++++ 1 file changed, 764 insertions(+)