Merge "tcptls: Use new certificate upon sip reload" into 13

author Joshua Colp <jcolp@digium.com>

Fri, 2 Dec 2016 13:56:51 +0000 (07:56 -0600)

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

Fri, 2 Dec 2016 13:56:51 +0000 (07:56 -0600)
author Joshua Colp <jcolp@digium.com>
Fri, 2 Dec 2016 13:56:51 +0000 (07:56 -0600)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 2 Dec 2016 13:56:51 +0000 (07:56 -0600)
diff --cc include/asterisk/tcptls.h
Simple merge
diff --cc main/tcptls.c
Simple merge
author	Joshua Colp <jcolp@digium.com>
	Fri, 2 Dec 2016 13:56:51 +0000 (07:56 -0600)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 2 Dec 2016 13:56:51 +0000 (07:56 -0600)
		1	2
include/asterisk/tcptls.h	patch \|	diff1 \|	diff2 \|	blob \| history
main/tcptls.c	patch \|	diff1 \|	diff2 \|	blob \| history