From a8e5a4730d1e42927f291158588cf269cd6f8b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
 <manuel.pegourie-gonnard@arm.com>
Date: Fri, 9 Jun 2017 14:45:14 +0200
Subject: [PATCH] Merge near-duplicate ChangeLog entries

As agreed with Gilles on the PR discussion page
---
 ChangeLog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 626f70d626..09b6c9950a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,8 +8,6 @@ Security
      option if needed.
    * Fixed offset in FALLBACK_SCSV parsing that caused TLS server to fail to
      detect it sometimes. Reported by Hugo Leisink. #810
-   * Tighten ASN.1 parsing of RSA PKCS#1 v1.5 signatures, to avoid a
-     potential Bleichenbacher-style attack.
    * Tighten parsing of RSA PKCS#1 v1.5 signatures, to avoid a
      potential Bleichenbacher/BERserk-style attack.