[tbb-commits] [tor-browser-build/master] Pick up fix for #40087 for -build2

[gk at torproject.org]

commit ab5f1f6046a62b7f563fff3c30f1420eec5d0b05
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Sep 13 19:35:00 2020 +0000

    Pick up fix for #40087 for -build2
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++-
 rbm.conf                                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 4821e83..ab3f0cd 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -18,8 +18,9 @@ Tor Browser 10.0a7 -- September 14 2020
    * Windows + OS X + Linux
      * Bump Go to 1.14.7
      * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
-     * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
      * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
+     * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
+     * Bug 40087: Deterministically add HTTPS Everywhere into omni.ja
    * Windows
      * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
      * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
diff --git a/rbm.conf b/rbm.conf
index 7cf5369..eaef6c7 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '10.0a7'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 10.0a6
   project_name: tor-browser