[tbb-commits] [tor-browser-build/maint-9.0] Pick up new tag for Tor Launcher for build2

[gk at torproject.org]

commit 803d014ed9be0ff5a2ee253798f3c3e9b0fc1723
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Oct 18 21:21:39 2019 +0000

    Pick up new tag for Tor Launcher for build2
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++-
 projects/tor-launcher/config                        | 2 +-
 rbm.conf                                            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index cf41275..e2e668f 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -38,8 +38,9 @@ Tor Browser 9.0 -- October 22 2019
    * Update Tor to 0.4.1.6
    * Update OpenSSL to 1.1.1d
      * Bug 31844: OpenSSL 1.1.1d fails to compile for some platforms/architectures
-   * Update Tor Launcher to 0.2.20
+   * Update Tor Launcher to 0.2.20.1
      * Bug 28044: Integrate Tor Launcher into tor-browser
+     * Bug 32154: Custom bridge field only allows one line of input
      * Bug 31286: New strings for about:preferences#tor
      * Bug 31303: Do not launch tor in browser toolbox
      * Bug 32112: Fix bad & escaping in translations
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 54e4973..c4010e7 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.20
+version: 0.2.20.1
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index ab0bbb5..926e3aa 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.0'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 8.5.5
   project_name: tor-browser