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

[gk at torproject.org]

commit ceb8ae7859601fb28b601b8e72d96e9fadd1b8cc
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Mar 8 10:16:53 2018 +0000

    Release preparations for 8.0a3
    
    Changelog update and versions bump
---
 projects/firefox-langpacks/config                   |  2 +-
 projects/firefox/config                             |  6 +++---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++
 projects/tor-launcher/config                        |  2 +-
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  6 +++---
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 04cd7dd..4e42939 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: build2
+  ff_build: build1
   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 b62fce3..48b8ea4 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-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.6.0
+  firefox_platform_version: 52.7.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 8.0
   torbrowser_update_channel: alpha
@@ -28,7 +28,7 @@ targets:
       torbrowser_update_channel: release
 
   nightly:
-    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2'
+    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
     tag_gpg_id: 0
     var:
       torbrowser_update_channel: default
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 3cd0e63..6000cd3 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,17 @@
+Tor Browser 8.0a3 -- March 13 2018
+ * All platforms
+   * Update Firefox to 52.7.0esr
+   * Update Tor to 0.3.3.3-alpha
+   * Update Tor Launcher to 0.2.15.1
+     * Bug 23136: Moat integration (fetch bridges for the user)
+     * Translations update
+   * Update HTTPS Everywhere to 2018.2.26
+     * Bug 25339: Adapt build system for Python 3.6 based build procedure
+   * Bug 25356: Update obfs4proxy to v0.0.7
+   * Bug 25147: Sanitize HTML fragments created for chrome-privileged documents
+ * Windows
+   * Bug 25112: No sandboxing on 64-bit Windows <= Vista
+
 Tor Browser 8.0a2 -- February 23 2018
  * All Platforms
    * Update Tor to 0.3.3.2-alpha
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 0406800..1d67b05 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.15
+version: 0.2.15.1
 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 3b805ad..e650b6e 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.2-alpha
+version: 0.3.3.3-alpha
 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 f6a9212..22d98dd 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.0a2'
-  torbrowser_build: 'build3'
+  torbrowser_version: '8.0a3'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.0a1
+    - 8.0a2
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1