Revision 89f6c5b4926c8ef8bc1a544a031ed3e01e092cbe authored by Matt Caswell on 05 January 2015, 00:34:00 UTC, committed by Matt Caswell on 22 January 2015, 09:41:33 UTC
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5) Conflicts: crypto/x509v3/pcy_tree.c Conflicts: apps/apps.c ssl/ssltest.c Conflicts: apps/apps.c crypto/ec/ec2_oct.c crypto/ec/ecp_nistp224.c crypto/ec/ecp_nistp256.c crypto/ec/ecp_nistp521.c ssl/s3_cbc.c ssl/ssl_sess.c ssl/t1_lib.c Reviewed-by: Tim Hudson <tjh@openssl.org>
1 parent f326f65

Computing file changes ...