Merge "dtls: Add support for ephemeral DTLS certificates."

author Joshua Colp <jcolp@digium.com>

Mon, 6 Nov 2017 18:22:38 +0000 (12:22 -0600)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Mon, 6 Nov 2017 18:22:38 +0000 (12:22 -0600)
author Joshua Colp <jcolp@digium.com>
Mon, 6 Nov 2017 18:22:38 +0000 (12:22 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 6 Nov 2017 18:22:38 +0000 (12:22 -0600)
diff --cc res/res_pjsip.c
Simple merge
diff --cc res/res_pjsip/pjsip_configuration.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Mon, 6 Nov 2017 18:22:38 +0000 (12:22 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Mon, 6 Nov 2017 18:22:38 +0000 (12:22 -0600)
		1	2
res/res_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip/pjsip_configuration.c	patch \|	diff1 \|	diff2 \|	blob \| history