[tbb-commits] [tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.18

[sysrqb at torproject.org]

commit 4cc5b98635a7ae7f56fb60dd46dde9af0d022f2d
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Jun 15 01:09:17 2021 +0000

    Release preparation for 10.0.18
    
    Versions bump and Changelog update
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++
 projects/tor/config                                 | 2 +-
 rbm.conf                                            | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 9af7938..56586f2 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 10.0.18 -- June 16 2021
+ * Windows + OS X + Linux
+   * Update Tor to 0.4.5.9
+
 Tor Browser 10.0.17 -- June 1 2021
  * Windows + OS X + Linux
    * Update Firefox to 78.11.0esr
diff --git a/projects/tor/config b/projects/tor/config
index bef0afc..ffc1e98 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.4.5.8
+version: 0.4.5.9
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index 7cd3dec..d438e1f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.17'
+  torbrowser_version: '10.0.18'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0.16
+    - 10.0.17
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1