Merge branch 'tlsspec'
authorWouter Verhelst <w@uter.be>
Thu, 4 Jun 2015 14:29:29 +0000 (16:29 +0200)
committerWouter Verhelst <w@uter.be>
Thu, 4 Jun 2015 14:29:29 +0000 (16:29 +0200)
commit630ac887cb93aa68f05ad6d359a943b617afb5a0
tree0a9e2252ab13dc49a015f5675dcf41c70533e091
parent1dd95821b9db1f2d4456d31a81e2d8abb97b0220
parent7206c5dcd4f7aa8ca856b2bf1c83c31300d309e8
Merge branch 'tlsspec'
doc/proto.txt