[tbb-commits] [tor-browser-build/master] Pick up 68.0 -3 for updater patches

[gk at torproject.org]

commit c54f90e102124dcd77d6efb9e186a4e3215972a8
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Aug 22 21:41:11 2019 +0000

    Pick up 68.0 -3 for updater patches
---
 projects/firefox/config                 | 2 +-
 projects/firefox/mozconfig-linux-i686   | 2 +-
 projects/firefox/mozconfig-linux-x86_64 | 2 +-
 projects/firefox/mozconfig-osx-x86_64   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index a1073d5..f6ce67c 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -49,7 +49,7 @@ targets:
       branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official'
 
   nightly:
-    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2'
+    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3'
     tag_gpg_id: 0
     var:
       torbrowser_update_channel: default
diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index ff65c87..c8f19a4 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -28,7 +28,7 @@ ac_add_options --enable-official-branding
 # Let's support GTK3 for ESR60
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
-# XXX: ac_add_options --enable-tor-browser-update
+ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index 69dc4ef..12f1b28 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -23,7 +23,7 @@ ac_add_options --enable-official-branding
 # Let's support GTK3 for ESR60
 ac_add_options --enable-default-toolkit=cairo-gtk3
 
-# XXX: ac_add_options --enable-tor-browser-update
+ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 188bcc9..07dd023 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -38,7 +38,7 @@ ac_add_options --enable-optimize
 ac_add_options --disable-debug
 
 ac_add_options --enable-tor-browser-data-outside-app-dir
-#ac_add_options --enable-tor-browser-update
+ac_add_options --enable-tor-browser-update
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar