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

[gk at torproject.org]

commit 12a0d42d620256023640578b8bb7a23520710056
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Apr 16 18:41:32 2018 +0000

    Release preparations for 8.0a6
    
    Changelog update, versions bump
---
 projects/firefox/config                            |  2 +-
 projects/https-everywhere/config                   |  2 +-
 projects/openssl/config                            |  4 ++--
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 23 ++++++++++++++++++++++
 projects/tor/config                                |  2 +-
 projects/torbutton/config                          |  2 +-
 rbm.conf                                           |  7 +++----
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 8412c2c..ee79a15 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") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 38eb2be..cfa0a78 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.3.13
+version: 2018.4.11
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/openssl/config b/projects/openssl/config
index 378ee53..9ab54c6 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.0.2n
+version: 1.0.2o
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -25,4 +25,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-    sha256sum: 370babb75f278c39e0c50e8c4e7493bc0f18db6867478341a832a982fd15a8fe
+    sha256sum: ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index aeb0cac..b9d3941 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,26 @@
+Tor Browser 8.0a6 -- April 19 2018
+ * All platforms
+   * Update Tor to 0.3.3.5-rc
+   * Update OpenSSL to 1.0.2o
+   * Update Torbutton to 1.9.9.1
+     * Bug 25126: Make about:tor layout responsive
+     * Translations update
+   * Update HTTPS Everywhere to 2018.4.11
+   * Update NoScript to 5.1.8.5
+   * Bug 21537: Mark .onion cookies as secure
+   * Bug 21850: Update about:tbupdate handling for e10s
+   * Bug 25721: Backport patches from Mozilla's bug 1448771
+ * Linux
+   * Bug 20283: Tor Browser should run without a `/proc` filesystem.
+ * Windows
+   * Bug 13893: Make EMET compatible with Tor Browser
+ * Build System
+   * Windows
+     * Bug 25420: Update GCC to 6.4.0
+     * Bug 20302: Fix FTE compilation for Windows with GCC 6.4.0
+   * Linux
+     * Bug 25304: Update GCC to 6.4.0
+
 Tor Browser 8.0a5 -- March 27 2018
  * All platforms
    * Update Firefox to 52.7.3esr
diff --git a/projects/tor/config b/projects/tor/config
index 7029880..78d834f 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.3.3-alpha
+version: 0.3.3.5-rc
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/projects/torbutton/config b/projects/torbutton/config
index de7691a..93bef30 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.9.9
+version: 1.9.9.1
 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 2654371..87ab109 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,11 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.0a5'
-  torbrowser_build: 'build2'
+  torbrowser_version: '8.0a6'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.0a3
-    - 8.0a4
+    - 8.0a5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1