Merge branch 'master' of git.openssl.org:openssl

Previous commit was reviewed by Geoff, not Stephen:
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
This commit is contained in:
Rich Salz 2014-09-09 17:06:40 -04:00
commit c939cca1a3

Diff content is not available