[tbb-commits] [tor-browser-build/master] Release preparations for 7.5a9 (build4)

[gk at torproject.org]

commit 66f424078b1971d393406165f79d050e78d574f2
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Dec 7 07:51:42 2017 +0000

    Release preparations for 7.5a9 (build4)
    
    Versions bump and Changelog update
---
 projects/firefox-langpacks/config                   | 2 +-
 projects/firefox/config                             | 4 ++--
 projects/https-everywhere/config                    | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++--
 rbm.conf                                            | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 4e42939..04cd7dd 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index d3cc063..4821baf 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
@@ -28,7 +28,7 @@ targets:
       torbrowser_update_channel: release
 
   nightly:
-    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
+    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2'
     tag_gpg_id: 0
     var:
       torbrowser_update_channel: default
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 57e1338..34947db 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2017.11.21
+version: 2017.12.6
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c92b0c0..092d36e 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,8 +1,8 @@
-Tor Browser 7.5a9 -- December 08 2017
+Tor Browser 7.5a9 -- December 09 2017
  * All Platforms
    * Update Firefox to 52.5.2esr
    * Update Tor to 0.3.2.6-alpha
-   * Update HTTPS-Everywhere to 2017.11.21
+   * Update HTTPS-Everywhere to 2017.12.6
    * Update NoScript to 5.1.8.1
    * Update sandboxed-tor-browser to 0.0.16
 
diff --git a/rbm.conf b/rbm.conf
index 504c20b..5714e1f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '7.5a9'
-  torbrowser_build: 'build3'
+  torbrowser_build: 'build4'
   torbrowser_incremental_from:
     - 7.5a8
   project_name: tor-browser