[tbb-commits] [tor-browser-build/master] Release preparations for 7.5a6

[gk at torproject.org]

commit 9b4ba8252a80fb10ca9fc22e90033d63383ac05d
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Oct 18 06:59:07 2017 +0000

    Release preparations for 7.5a6
    
    Changelog update and version bumps
---
 projects/firefox/config                             |  4 ++--
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor/config                                 |  2 +-
 projects/torbutton/config                           |  2 +-
 rbm.conf                                            |  6 +++---
 7 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 5fe6eb1..85a4f00 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,13 +1,13 @@
 # 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-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 52.4.0
+  firefox_platform_version: 52.4.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 7.5
   torbrowser_update_channel: alpha
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 0ccd4e1..99290e7 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2017.9.12
+version: 2017.10.4
 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 56fcb64..e18d650 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,21 @@
+Tor Browser 7.5a6 -- October 19 2017
+ * All Platforms
+   * Update Firefox to 52.4.1esr
+   * Update Tor to 0.3.2.2-alpha
+   * Update Torbutton to 1.9.8.2
+     * Bug 23887: Update banner locales and Mozilla text
+     * Translations update
+   * Update HTTPS-Everywhere to 2017.10.4
+   * Update NoScript to 5.1.2
+     * Bug 23723: Loading entities from NoScript .dtd files is blocked
+     * Bug 23724: NoScript update breaks Security Slider and its icon disappears
+   * Bug 23745: Tab crashes when using Tor Browser to access Google Drive
+   * Bug 23694: Update the detailsURL in update responses
+   * Bug 22501: Requests via javascript: violate FPI
+ * OS X
+   * Bug 23807: Tab crashes when playing video on High Sierra
+   * Bug 23025: Add some hardening flags to macOS build
+
 Tor Browser 7.5a5 -- September 28 2017
  * All Platforms
    * Update Firefox to 52.4.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 5121459..a777a98 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -57,9 +57,9 @@ input_files:
     name: snowflake
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-5.0.10-fx+sm.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-5.1.2-fx+sm.xpi
     name: noscript
-    sha256sum: cfc8018a5ddd2a699581932a9911e28b1060667c7849cf5283b548b5b29a65a2
+    sha256sum: 82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb
   - filename: RelativeLink
     enable: '[% c("var/linux") %]'
   - project: libdmg-hfsplus
diff --git a/projects/tor/config b/projects/tor/config
index 26c3780..b5df573 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.3.2.1-alpha
+version: 0.3.2.2-alpha
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 gpg_keyring: tor.gpg
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 2cc2288..6e45ef8 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.9.8.1
+version: 1.9.8.2
 git_url: https://git.torproject.org/torbutton.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index 6b5fc3e..80a7091 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '7.5a5'
-  torbrowser_build: 'build5'
+  torbrowser_version: '7.5a6'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 7.5a4
+    - 7.5a5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1