Merge version 60.3.0esr-1+rpi1 and 60.4.0esr-1 to produce 60.4.0esr-1+rpi1

diff --cc debian/changelog
index f19664f3b873cdf67c1aebced41c0f286f58be6f,0a1ce8bf2e31e35367cb7f3437d04c4fad9505a6..cf627e7651c99c8d0b774dd5a095e293220f0ff2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,36 +1,45 @@@
- firefox-esr (60.3.0esr-1+rpi1) buster-staging; urgency=medium
++firefox-esr (60.4.0esr-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 05 Dec 2018 06:56:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 06 Jan 2019 14:03:20 +0000
++
+ firefox-esr (60.4.0esr-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Fixes for mfsa2018-30, also known as:
+     CVE-2018-17466, CVE-2018-18492, CVE-2018-18493, CVE-2018-18494,
+     CVE-2018-18498, CVE-2018-12405.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 12 Dec 2018 08:29:04 +0900
+ 
+ firefox-esr (60.3.0esr-3) unstable; urgency=medium
+ 
+   * debian/browser.install.in, debian/rules: Properly copy the watermark to
+     /usr/share/icons/hicolor/symbolic/apps.
+   * debian/rules: Pass compiler and compiler flags environment variables
+     down to ICU configure. That will make it use GCC instead of defaulting
+     to clang now it's in PATH, avoiding the failing to build the ICU data
+     file on big endian platforms because clang doesn't know some of the GCC
+     flags it somehow got from the environment.
+ 
+  -- Mike Hommey <glandium@debian.org>  Wed, 28 Nov 2018 14:28:56 +0900
+ 
+ firefox-esr (60.3.0esr-2) unstable; urgency=medium
+ 
+   * debian/control*: Build depend on unversioned clang/llvm.
+     Closes: #912804.
+   * debian/rules: Use embedded libevent in backports. Closes: #910397.
+ 
+   * build/unix/elfhack/test.c: Try to ensure the bss section of the
+     elfhack testcase stays large enough. bz#1505608.
+   * memory/build/mozjemalloc.cpp: Fix run sizes for size classes >= 16KB
+     on systems with large pages. bz#1507035. Closes: #911898.
+ 
+  -- Mike Hommey <glandium@debian.org>  Mon, 26 Nov 2018 10:42:42 +0900
  
  firefox-esr (60.3.0esr-1) unstable; urgency=medium
  

diff --cc debian/patches/series
Simple merge

diff --cc debian/rules
Simple merge