From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 4 Apr 2020 15:15:02 +0000 (+0100)
Subject: Merge version 2.0.13-1+rpi1 and 2.0.13-2 to produce 2.0.13-2+rpi1
X-Git-Tag: archive/raspbian/2.0.13-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c97f4cfefab3854f9ef0ab0abf853011e048bc1b;p=haproxy.git

Merge version 2.0.13-1+rpi1 and 2.0.13-2 to produce 2.0.13-2+rpi1
---

c97f4cfefab3854f9ef0ab0abf853011e048bc1b
diff --cc debian/changelog
index 38e5e03,5c9fe8b..0f6a09d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- haproxy (2.0.13-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.0.13-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 14 Mar 2019 20:25:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Feb 2020 17:17:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 04 Apr 2020 15:15:02 +0000
++
+ haproxy (2.0.13-2) unstable; urgency=medium
+ 
+   * d/dconv: replace cgi.escape by html.escape. Closes: #951416.
+   * d/copryight: document OpenSSL exception. Closes: #951782.
+   * d/haproxy.cfg: use "ssl-min-ver" to set minimum version.
+   * Apply one patch to fix an overflow in HTTP/2 header handling.
+     Fix CVE-2020-11100.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Wed, 01 Apr 2020 21:49:32 +0200
  
  haproxy (2.0.13-1) unstable; urgency=medium