[tor-browser-build/master] Release preparations for 8.5a5 - tor-commits

30 Nov 2018

commit 7b2b5ae4bac7863075fac61259328c9577e87475
Author: Georg Koppen gk@torproject.org
Date:   Fri Nov 30 07:28:43 2018 +0000
Release preparations for 8.5a5
Versions bump and Changelog update
---
 projects/firefox/config                            |  2 +-
 projects/https-everywhere/config                   |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 58 ++++++++++++++++++++++
 projects/tor-browser/config                        |  4 +-
 projects/tor-launcher/config                       |  2 +-
 projects/tor/config                                |  2 +-
 projects/torbutton/config                          |  2 +-
 rbm.conf                                           |  6 +--
 8 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 68918d9..81416a2 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
 git_submodule: 1
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index e189eb9..b0b3ce9 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.9.19
+version: 2018.10.31
 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 3bd05ed..5c3732b 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,61 @@
+Tor Browser 8.5a5 -- December 3 2018
+ * All Platforms
+   * Update Torbutton to 2.1.2
+     * Bug 25013: Integrate Torbutton into tor-browser for Android
+     * Bug 27111: Update about:tor desktop version to work on mobile
+     * Bug 28093: Update donation banner style to make it fit in small screens
+     * Bug 28543: about:tor has scroll bar between widths 900px and 1000px
+     * Bug 28039: Enable dump() if log method is 0
+     * Bug 27701: Don't show App Blocker dialog on Android
+     * Bug 28187: Change tor circuit icon to torbutton.svg
+     * Bug 28515: Use en-US for english Torbutton strings
+     * Translations update
+   * Update Tor Launcher to 0.2.18
+     * Bug 28039: Enable dump() if log method is 0
+     * Translations update
+   * Update HTTPS Everywhere to 2018.10.31
+   * Update NoScript to 10.2.0
+   * Bug 22343: Make 'Save Page As' obey first-party isolation
+   * Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading
+ * Windows
+   * Update Tor to 0.3.5.5-alpha
+   * Bug 28310: Don't build obfs4 with module versioning support
+   * Bug 27827: Update Go to 1.11.1
+   * Bug 28185: Add smallerRichard to Tor Browser
+   * Bug 28657: Remove broken FTE bridge from Tor Browser
+ * OS X
+   * Update Tor to 0.3.5.5-alpha
+   * Bug 28310: Don't build obfs4 with module versioning support
+   * Bug 27827: Update Go to 1.11.1
+   * Bug 27827: Build snowflake reproducibly
+   * Bug 28258: Don't look for webrtc headers under talk/
+   * Bug 28185: Add smallerRichard to Tor Browser
+ * Linux
+   * Update Tor to 0.3.5.5-alpha
+   * Bug 28310: Don't build obfs4 with module versioning support
+   * Bug 27827: Update Go to 1.11.1
+   * Bug 27827: Build snowflake reproducibly
+   * Bug 28258: Don't look for webrtc headers under talk/
+   * Bug 28185: Add smallerRichard to Tor Browser
+   * Bug 28657: Remove broken FTE bridge from Tor Browser
+ * Android
+   * Bug 28051: Fix up Orbot for inclusion into Tor Browser
+   * Bug 26690+25765: Port padlock states for .onion serices to mobile
+   * Bug 28507: Delete private data in the browser startup
+   * Bug 27111+25013: Configure Tor Browser for mobile to load about:tor
+   * Bug 27256: Enable TouchEvents on Android
+   * Bug 28640: Use system add-on and distributed preferences
+ * Build System
+   * Bug 27977: Build Orbot inside tor-browser-build
+   * Bug 27443: Update Firefox RBM config and build for Android
+   * Bug 27439: Add android target for rust compiler
+   * Bug 28469: Fix unsupported libbacktrace in Rust 1.26
+   * Bug 28468: Modify Android toolchain to support Orbot
+   * Bug 28483: Modify Android Toolchain API Version
+   * Bug 28472: Add Android Makefile Rules
+   * Bug 28470: Add fetch gradle dependency script to common project
+   * Bug 28144: Update projects/tor-browser for Android
+
 Tor Browser 8.5a4 -- October 23 2018
  * All Platforms
    * Update Firefox to 60.3.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index e4e3a03..149b800 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -84,9 +84,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite...
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite...
     name: noscript
-    sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9
+    sha256sum: 23c7783eecabeb044aa1e38c93d43ce7c41957b1ea031016d39737712729c81d
   - 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 ff5b387..4f2d2b7 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.17
+version: 0.2.18
 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 cc6df23..4ba18d9 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.5.3-alpha
+version: 0.3.5.5-alpha
 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 b4d50be..2e48f31 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.1.1
+version: 2.1.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 87fe179..5d1d861 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
var:
-  torbrowser_version: '8.5a4'
-  torbrowser_build: 'build2'
+  torbrowser_version: '8.5a5'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.5a3
+    - 8.5a4
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

    