Merge branch 'tls-kdh' of https://github.com/arpa2/tlspool into tls-kdh

author Rick van Rein <rick@openfortress.nl>

Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)

committer Rick van Rein <rick@openfortress.nl>

Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
author Rick van Rein <rick@openfortress.nl>
Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
committer Rick van Rein <rick@openfortress.nl>
Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
diff --cc src/Makefile
Simple merge
diff --cc src/starttls.c
Simple merge
diff --cc tool/get_localid.c
Simple merge
author	Rick van Rein <rick@openfortress.nl>
	Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
committer	Rick van Rein <rick@openfortress.nl>
	Mon, 17 Oct 2016 22:02:01 +0000 (23:02 +0100)
		1	2
src/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
src/starttls.c	patch \|	diff1 \|	diff2 \|	blob \| history
tool/get_localid.c	patch \|	diff1 \|	diff2 \|	blob \| history