Merge version 2.2.5-2+rpi1 and 2.2.6-1 to produce 2.2.6-1+rpi1

diff --cc debian/changelog
index 72acb49054e1eddbbdd1c38db17500155738d7e5,4da44e3c8c931776fff5486ec220cbaecf4854aa..936b25a2ce1e11e6072e894320d59ed5bb7f70a3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- haproxy (2.2.5-2+rpi1) bullseye-staging; urgency=medium
++haproxy (2.2.6-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Nov 2020 23:34:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Dec 2020 13:40:11 +0000
++
+ haproxy (2.2.6-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - BUG/MAJOR: filters: Always keep all offsets up to date during data
+                  filtering
+     - BUG/MAJOR: peers: fix partial message decoding
+     - BUG/MAJOR: spoe: Be sure to remove all references on a released spoe
+                  applet
+     - BUG/MAJOR: tcpcheck: Allocate input and output buffers from the buffer
+                  pool
+   * d/patches: remove patches applied upstream
+ 
+  -- Vincent Bernat <bernat@debian.org>  Mon, 30 Nov 2020 20:02:49 +0100
  
  haproxy (2.2.5-2) unstable; urgency=medium