Fixup previous merge.
authorBernd Edlinger <bernd.edlinger@hotmail.de>
Wed, 22 Feb 2017 07:14:07 +0000 (08:14 +0100)
committerMatt Caswell <matt@openssl.org>
Fri, 10 Mar 2017 14:48:40 +0000 (14:48 +0000)
commit0b1f26648671b94e2ae3e11d602556a4e46535ce
tree66b172d170c863e1b8c97cbf03aad41a1d26257c
parente5fd8ca43beeb40d33d421b519fb7e1d20358b94
Fixup previous merge.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2703)
ssl/t1_lib.c