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

diff --cc debian/changelog
index 341aaf39c5e72afc3fa35af6aee065f9de9f1c3d,7ddd7126a6f770d9313e452df53d6e2a105b17c2..036435474dba214ef2c00759de534549a542af2c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- trafficserver (8.0.2+ds-1+rpi1+deb10u3) buster-staging; urgency=medium
++trafficserver (8.0.2+ds-1+rpi1+deb10u4) 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>  Sun, 28 Jun 2020 16:33:35 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 09 Dec 2020 22:48:44 +0000
++
+ trafficserver (8.0.2+ds-1+deb10u4) buster-security; urgency=high
+ 
+   * Add fix from upstream for CVE-2020-17508
+   * Add fix from upstream for CVE-2020-17509
+ 
+  -- Jean Baptiste Favre <debian@jbfavre.org>  Sun, 06 Dec 2020 17:00:17 +0100
  
  trafficserver (8.0.2+ds-1+deb10u3) buster-security; urgency=high