Merge version 8.0.2+ds-1+rpi1+deb10u4 and 8.0.2+ds-1+deb10u5 to produce 8.0.2+ds...

diff --cc debian/changelog
index 036435474dba214ef2c00759de534549a542af2c,f041029bc1b241ba8572cc971482a407337e7c1e..a12a4450ac311ae8cfc246ec71ada002134eae4e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- trafficserver (8.0.2+ds-1+rpi1+deb10u4) buster-staging; urgency=medium
++trafficserver (8.0.2+ds-1+rpi1+deb10u5) buster-staging; urgency=medium
 +
 +  [changes brought forward from 8.0.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 19 Jan 2019 12:42:48 +0000]
 +  * Use -latomic on raspbian too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Dec 2020 22:48:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Aug 2021 11:19:58 +0000
++
+ trafficserver (8.0.2+ds-1+deb10u5) buster-security; urgency=medium
+ 
+   * CVE-2021-35474 CVE-2021-32567 CVE-2021-32566 CVE_2021-32565
+     CVE-2021-27577 (Closes: #990303)
+ 
+  -- Moritz Mühlenhoff <jmm@debian.org>  Mon, 26 Jul 2021 22:59:59 +0200
  
  trafficserver (8.0.2+ds-1+deb10u4) buster-security; urgency=high