Merge version 2.0.17-1+rpi1 and 2.0.18-1 to produce 2.0.18-1+rpi1

diff --cc debian/changelog
index afc7020432878d3654fe44d1165aafca0c024934,70fb1481020a5b3dd6fef34501ad6f19e2a4440d..4605e0721a5f961c8515727635572578e2fa910a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,15 @@@
- haproxy (2.0.17-1+rpi1) bullseye-staging; urgency=medium
++haproxy (2.0.18-1+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>  Fri, 14 Aug 2020 02:11:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Oct 2020 00:14:26 +0000
++
+ haproxy (2.0.18-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Wed, 30 Sep 2020 13:41:09 +0200
  
  haproxy (2.0.17-1) unstable; urgency=medium