Merge version 68.4.2esr-1+rpi1 and 68.5.0esr-1 to produce 68.5.0esr-1+rpi1

diff --cc debian/changelog
index 59a12e488f68869a078fb0f52b8ab67a86764f17,9d1e443327fa04b3eb7fb0b5c86306487a8ded02..18af6679c5b564f821285975f48b5b3684e4025f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,10 +1,26 @@@
- firefox-esr (68.4.2esr-1+rpi1) bullseye-staging; urgency=medium
++firefox-esr (68.5.0esr-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduce in 60.8.0esr-1+rpi1 by Peter Michael Green]
 +  * Use a fake homedir for build (Closes: 933757).
 +
 +  [changes introduced in 68.2.0esr-1+rpi1 by Peter Michael Green]
 +  * Disable webrtc, it seems to fail to build on raspbian.
 +  * Try to disable Neon
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Feb 2020 11:20:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Feb 2020 05:16:51 +0000
++
+ firefox-esr (68.5.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release
+   * Fixes for mfsa2020-06, also known as:
+     CVE-2020-6796, CVE-2020-6798, CVE-2020-6800.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 12 Feb 2020 06:50:33 +0900
  
  firefox-esr (68.4.2esr-1) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge