Merge branch 'tls-kdh' of https://github.com/arpa2/tlspool into tls-kdh
authorRick van Rein <rick@openfortress.nl>
Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
committerRick van Rein <rick@openfortress.nl>
Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
commit5fd1a1e72b640070c41ef7fc9c9a64af717583ff
treeed9406b4b72e7aa93221e379f0e78ad61103456f
parent52c09adf15de7bc4bbd8ca9befaa430592b7e3aa
parentdfcfcc245ced8f7d461068ef132fc2604880d8ad
Merge branch 'tls-kdh' of https://github.com/arpa2/tlspool into tls-kdh

Conflicts:
tool/get_localid.c
src/Makefile
src/starttls.c
tool/get_localid.c