Merge version 2.4.17-1+rpi1 and 2.4.18-1 to produce 2.4.18-1+rpi1

diff --cc debian/changelog
index 25b3f606dcbbe5068d97f216a6d0aa35e321f2c0,6c1ce0ecafe6f12c13850055d81a239c8986002a..8a6a2c936e2dd69c8001ad26ec471ffc1caecf10
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- haproxy (2.4.17-1+rpi1) bookworm-staging; urgency=medium
++haproxy (2.4.18-1+rpi1) bookworm-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>  Thu, 16 Jun 2022 13:13:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Aug 2022 07:20:45 +0000
++
+ haproxy (2.4.18-1) unstable; urgency=medium
+ 
+   [ Lucas Kanashiro ]
+   * d/t/utils: add helper functions to be re-used in tests
+   * d/t/proxy-localhost: refactor to use the check_index_file helper function
+   * d/t/proxy-ssl-termination: add test for the SSL termination proxy feature
+   * d/t/proxy-ssl-pass-through: add test for the SSL Pass-Through proxy feature
+ 
+   [ Vincent Bernat ]
+   * New upstream release.
+ 
+  -- Vincent Bernat <bernat@debian.org>  Wed, 27 Jul 2022 15:59:36 +0200
  
  haproxy (2.4.17-1) unstable; urgency=medium