Merge version 60.5.0esr-1+rpi1 and 60.5.1esr-1 to produce 60.5.1esr-1+rpi1

diff --cc debian/changelog
index 313b43b116fde144a22b1a6020545d564173a11f,ec3bb6c012df914330f93d57b39f8f3c3a981f90..d5c399263ad8cb2a47e0c8e7f589e8be3af83dac
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,15 +1,24 @@@
- firefox-esr (60.5.0esr-1+rpi1) buster-staging; urgency=medium
++firefox-esr (60.5.1esr-1+rpi1) buster-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Feb 2019 03:21:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 25 Feb 2019 19:08:54 +0000
++
+ firefox-esr (60.5.1esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2019-05, also known as:
+     CVE-2018-18356, CVE-2019-5785.
+ 
+   * debian/rules, debian/upstream.mk: Manually set the update channel.
+     Closes: #921381, #921121, #921654.
+   * debian/rules: Disable ion JIT on mips and mipsel. This should fix the
+     FTBFS.
+ 
+  -- Mike Hommey <glandium@debian.org>  Thu, 14 Feb 2019 18:35:06 +0900
  
  firefox-esr (60.5.0esr-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge