[tor-browser-build/master] Release preparations for 7.5a10 - tor-commits

18 Dec 2017

commit ce45a8d054de9d9c7d93767a3e19915190a440ac
Author: Georg Koppen gk@torproject.org
Date:   Mon Dec 18 09:00:52 2017 +0000
Release preparations for 7.5a10
Versions bump and Changelog update
---
 projects/firefox/config                            |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 25 ++++++++++++++++++++++
 projects/tor-browser/config                        |  4 ++--
 projects/tor-launcher/config                       |  2 +-
 projects/tor/config                                |  2 +-
 projects/torbutton/config                          |  2 +-
 rbm.conf                                           |  5 +++--
 7 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 4821baf..182b6b5 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") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index ececb9a..cfbe26d 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,28 @@
+Tor Browser 7.5a10 -- December 19 2017
+ * All Platforms
+   * Update Tor to 0.3.2.7-rc
+   * Update OpenSSL to 1.0.2n
+   * Update Torbutton to 1.9.8.4
+     * Bug 21847: Update copy for security slider
+     * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up)
+     * Translations update
+   * Update Tor Launcher to 0.2.14.2
+     * Bug 24623: Revise "country that censors Tor" text
+     * Bug 24428: Bootstrap error message sometimes lost
+     * Bug 24624: tbb-logo.svg may cause network access
+     * Bug 10573: Replace deprecated nsILocalFile with nsIFile (code clean-up)
+     * Translations update
+   * Update NoScript to 5.1.8.3
+   * Bug 23104: CSS line-height reveals the platform Tor Browser is running on
+   * Bug 24398: Plugin-container process exhausts memory
+ * OS X
+   * Bug 24566: Avoid white flashes when opening dialogs in Tor Browser
+ * Linux
+   * Bug 23970: Make "Print to File" work with sandboxing enabled
+   * Bug 23016: "Print to File" is broken on some non-english Linux systems
+ * Android
+   * Bug 22084: Spoof network information API
+
 Tor Browser 7.5a9 -- December 09 2017
  * All Platforms
    * Update Firefox to 52.5.2esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index d2085b0..7fded62 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...
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite...
     name: noscript
-    sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2
+    sha256sum: 9a81de6e26f639e5f82cabddcd361177815c59af2bca6363ba755255feffd2ec
   - 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 587c257..c048175 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.14.1
+version: 0.2.14.2
 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 f662561..6f01b29 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.6-alpha
+version: 0.3.2.7-rc
 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 f92bb48..a4e8715 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.9.8.3
+version: 1.9.8.4
 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 5714e1f..8b9309d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,11 @@ buildconf:
   git_signtag_opt: '-s'
var:
-  torbrowser_version: '7.5a9'
-  torbrowser_build: 'build4'
+  torbrowser_version: '7.5a10'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 7.5a8
+    - 7.5a9
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

    