From: Ben Laurie <ben@links.org>
Date: Fri, 4 Oct 2013 11:48:24 +0000 (+0100)
Subject: Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead
X-Git-Tag: OpenSSL_1_0_2-beta1~206^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab3b624b0ce887f8207a539c2e975394f7e0a004;p=openssl

Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead
---

ab3b624b0ce887f8207a539c2e975394f7e0a004