[tbb-commits] [tor-browser-build/master] Revert "Bug 27865: Tor Browser 8.5a2 is crashing on Windows"

[gk at torproject.org]

commit b019cacb8fba8aef0362dcef4860e51a46394a13
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jan 17 07:30:02 2019 +0000

    Revert "Bug 27865: Tor Browser 8.5a2 is crashing on Windows"
    
    This reverts commit 49eb43da16695c8fce31129f3499a8258761025a.
    
    No longer needed after we bumped the binutils version to 2.32.1 in
    bug 26148.
---
 projects/firefox/mozconfig-windows-i686   | 1 +
 projects/firefox/mozconfig-windows-x86_64 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index a5e15f1..07e8851 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
 ac_add_options --disable-debug
diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64
index e7f857d..1665005 100644
--- a/projects/firefox/mozconfig-windows-x86_64
+++ b/projects/firefox/mozconfig-windows-x86_64
@@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
 ac_add_options --disable-debug