[tor-commits] [tor-browser-build/maint-7.5] Release preparations for 7.5.1

[gk at torproject.org]

commit 73462139142d483d9527c44068482cb24bc33b3f
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Mar 8 07:04:25 2018 +0000

    Release preparations for 7.5.1
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 projects/tor/config                                 |  2 +-
 projects/torbutton/config                           |  2 +-
 rbm.conf                                            |  6 +++---
 7 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 962f340..03ff65d 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") %]-2-build1'
+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.6.0
+  firefox_platform_version: 52.7.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 7.5
   torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 51f0cf9..f7c3b70 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,20 @@
+Tor Browser 7.5.1 -- March 13 2018
+ * All platforms
+   * Update Firefox to 52.7.0esr
+   * Update Tor to 0.3.2.10
+   * Update Torbutton to 1.9.8.6
+     * Bug 24159: Version check does not deal with platform specific checks
+     * Bug 25016: Remove 2017 donation banner
+     * Translations update
+   * Update Tor Launcher to 0.2.14.4
+     * Bug 25089: Special characters are not escaped in proxy password
+     * Translations update
+   * Update NoScript to 5.1.8.4
+   * Bug 25356: Update obfs4proxy to v0.0.7
+   * Bug 25000: Add [System+Principal] to the NoScript whitelist
+ * Windows
+   * Bug 25112: Disable sandboxing on 64-bit Windows <= Vista
+
 Tor Browser 7.5 -- January 23 2018
  * All Platforms
    * Update Firefox to 52.6.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 7fded62..661b8e2 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -66,9 +66,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.1.8.3-fx+sm.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-5.1.8.4-fx+sm.xpi
     name: noscript
-    sha256sum: 9a81de6e26f639e5f82cabddcd361177815c59af2bca6363ba755255feffd2ec
+    sha256sum: 1c85a72cd0d7d210f8dd463f9700214703a5f28319c2b1679db00f861a5289f7
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 5f04027..05d353f 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.14.3
+version: 0.2.14.4
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index df721e1..9107b28 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.9
+version: 0.3.2.10
 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 53d9a38..a4cba71 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.9.8.5
+version: 1.9.8.6
 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 9e18b53..176a55a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '7.5'
-  torbrowser_build: 'build3'
+  torbrowser_version: '7.5.1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 7.0.11
+    - 7.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1