resolved conflicts for merge of 3ccf38e0 to master
Change-Id: Icb684e90f1c895981566fbf7e1d44fd8b1c0d74a
diff --git a/patches/README b/patches/README
index 15cede5..ea02c7c 100644
--- a/patches/README
+++ b/patches/README
@@ -32,16 +32,6 @@
See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00.
-0001-Add-and-use-a-constant-time-memcmp.patch
-
-constant time memcmp
-
-
-0002-Make-CBC-decoding-constant-time.patch
-
-Make CBC decoding constant time CVE-2013-0169
-
-
clang.patch
Fixes two minor compilation errors when building with the Clang compiler.
@@ -53,3 +43,15 @@
See http://cvs.openssl.org/chngview?cn=22568 for upstream patch, and
https://groups.google.com/d/topic/mailing.openssl.dev/4Z67vaaTChk/discussion
for the most recent discussion.
+
+
+0001-Add-and-use-a-constant-time-memcmp.patch
+
+constant time memcmp
+
+
+0002-Make-CBC-decoding-constant-time.patch
+
+Make CBC decoding constant time CVE-2013-0169
+
+
