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

[gk at torproject.org]

commit 376527bbad5fa5550f1109c7d9de4bb216a32da2
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Jun 20 13:30:18 2018 +0000

    Release preparations for 7.5.6
    
    Changelog update and versions bump
---
 projects/firefox/config                             |  2 +-
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  3 ++-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index e91d1ca..cfafe70 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 52.8.1
+  firefox_platform_version: 52.9.0
   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 cfa0a78..2385c5c 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.4.11
+version: 2018.6.13
 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 5d52b10..f7160bf 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,19 @@
+Tor Browser 7.5.6 -- June 26 2018
+ * All platforms
+   * Update Firefox to 52.9.0esr
+   * Update Tor to 0.3.3.7
+   * Update Tor Launcher to 0.2.14.5
+     * Bug 20890: Increase control port connection timeout
+   * Update HTTPS Everywhere to 2018.6.13
+   * Update NoScript to 5.1.8.6
+   * Bug 21537: Mark .onion cookies as secure
+   * Bug 25938: Backport fix for cross-origin header leak (bug 1334776)
+   * Bug 25721: Backport patches from Mozilla's bug 1448771
+   * Bug 25147+25458: Sanitize HTML fragments for chrome documents
+   * Bug 26221: Backport fix for leak in SHA256 in nsHttpConnectionInfo.cpp
+ * Windows
+   * Bug 26424: Disable UNC paths to prevent possible proxy bypasses
+
 Tor Browser 7.5.5 -- June 10 2018
  * All platforms
    * Update Firefox to 52.8.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index dec5648..4d7c959 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://secure.informaction.com/download/releases/noscript-5.1.8.5.xpi
+  - URL: https://secure.informaction.com/download/releases/noscript-5.1.8.6.xpi
     name: noscript
-    sha256sum: 7180f8d24ca31989682dee229b95e3503699f2bb25cb593a6a1f2ce0a2253792
+    sha256sum: c09f19b0ce79ea9b59a988af77d28d48fd7afbbd26a85f93a35c22100eb51536
   - 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 05d353f..43a9cb0 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.14.4
+version: 0.2.14.5
 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 9107b28..7ec9504 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.10
+version: 0.3.3.7
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 gpg_keyring: tor.gpg
diff --git a/rbm.conf b/rbm.conf
index 4329958..5a90617 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '7.5.5'
+  torbrowser_version: '7.5.6'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 7.5.4
+    - 7.5.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1