cherry pick pr-512 changes
authorJoey Yandle <xoloki@gmail.com>
Wed, 13 Jan 2016 05:27:27 +0000 (21:27 -0800)
committerRich Salz <rsalz@openssl.org>
Sun, 29 May 2016 17:36:59 +0000 (13:36 -0400)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1079)


No differences found