Merge version 2.30.3-1+rpi1 and 2.30.4-1 to produce 2.30.4-1+rpi1

diff --cc debian/changelog
index 2ef2ad747b94bfb396ee6d439bba6e9894edf42a,808ad38ec5b38fa7d85101dd5187fb7a5dd797ef..8e344a029414f2151c613defd2f866524fb52884
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,21 @@@
- webkit2gtk (2.30.3-1+rpi1) bullseye-staging; urgency=medium
++webkit2gtk (2.30.4-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.6.2+dfsg1-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 25 Jan 2015 02:14:50 +0000]
 +  * Disable javascript JIT as it doesn't appear to be armv6 compatible
 +    (at least I assume that is the cause of the assembler errors)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 23 Nov 2020 11:22:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 09:37:36 +0000
++
+ webkit2gtk (2.30.4-1) unstable; urgency=high
+ 
+   * New upstream release.
+   * The WebKitGTK security advisory WSA-2020-0008 lists the following
+     security fixes in the latest versions of WebKitGTK:
+     + CVE-2020-9952 (fixed in 2.28.3).
+     + CVE-2020-9948, CVE-2020-9951 (fixed in 2.30.0).
+     + CVE-2020-9983, CVE-2020-13584 (fixed in 2.30.3).
+ 
+  -- Alberto Garcia <berto@igalia.com>  Tue, 15 Dec 2020 15:23:01 +0100
  
  webkit2gtk (2.30.3-1) unstable; urgency=high