Merge branch 'OpenSSL_1_0_2-stable' into pre-aead
authorBen Laurie <ben@links.org>
Sat, 5 Oct 2013 20:20:24 +0000 (21:20 +0100)
committerBen Laurie <ben@links.org>
Sat, 5 Oct 2013 20:20:24 +0000 (21:20 +0100)
commitc8c6914aacb444caecab300769587c8f295285bc
treee9c6efb6bcb76e29a0e86058443cd0052e9d2167
parentc99028f252f1bfb8317b356724810b835b962dd5
parent2d5dd00f9e82fa695540c267e8df9a93baea894c
Merge branch 'OpenSSL_1_0_2-stable' into pre-aead