diff options
author | John M. Schanck <jschanck@securityinnovation.com> | 2016-10-14 13:54:11 -0400 |
---|---|---|
committer | John M. Schanck <jschanck@securityinnovation.com> | 2016-10-14 13:54:11 -0400 |
commit | 5d428fe9b889ea43f71aa0d5c9673de37d1ca7f0 (patch) | |
tree | 6acdb9e9960079e3a015cfab84205669bf1eea6b /proposals/269-hybrid-handshake.txt | |
parent | e6ba76c41f59d536e95ad69e934a23fe3342aea4 (diff) | |
parent | 7c0ac12dbf345f4b283481d0079fe8f43d077279 (diff) | |
download | torspec-5d428fe9b889ea43f71aa0d5c9673de37d1ca7f0.tar.gz torspec-5d428fe9b889ea43f71aa0d5c9673de37d1ca7f0.zip |
Merge remote-tracking branch 'origin/master' into 269-change-kdf
Diffstat (limited to 'proposals/269-hybrid-handshake.txt')
0 files changed, 0 insertions, 0 deletions