[tbb-commits] [tor-browser-build/maint-10.0-desktop] Tor Browser 10.0.6 release preparations

[gk at torproject.org]

commit 8d42112e1d89e064efd4929667ccfcedb02d6ef5
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Dec 7 20:34:58 2020 +0000

    Tor Browser 10.0.6 release preparations
    
    Version bumps and Changelog update
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++
 rbm.conf                                            | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 3b26ac5..d5027f4 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.6 -- December 8 2020
+ * Windows + OS X + Linux
+   * Bug 40175: Update obfs4proxy's TLS certificate public key pinning [tor-browser-build]
+
 Tor Browser 10.0.5 -- November 17 2020
  * Windows + OS X + Linux
    * Update Firefox to 78.5.0esr
diff --git a/rbm.conf b/rbm.conf
index ac496bc..a549fc4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.5'
+  torbrowser_version: '10.0.6'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.0.2
-    - 10.0.4
+    - 10.0.5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1