[tor-commits] [builders/tor-browser-build] 05/05: Prep 11.5a10-build3

[gitolite role]

This is an automated email from the git hooks/post-receive script.

sysrqb pushed a commit to branch maint-11.5a10
in repository builders/tor-browser-build.

commit 431f3c75ce1117087f7804e1df79b90117dca915
Author: Matthew Finkel <sysrqb at torproject.org>
AuthorDate: Thu May 12 16:46:55 2022 +0000

    Prep 11.5a10-build3
---
 projects/geckoview/config                           | 2 +-
 projects/go/config                                  | 8 +++++++-
 projects/openssl/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++-
 rbm.conf                                            | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/projects/geckoview/config b/projects/geckoview/config
index 78de552..99b7c88 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build2'
+git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build3'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/go/config b/projects/go/config
index 2e2e8e2..54f41ab 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.18.1
+version: 1.17.9
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -96,6 +96,7 @@ targets:
     var:
       GOARCH: 386
   android:
+    version: 1.18.1
     var:
       GOOS: android
   android-x86:
@@ -117,6 +118,11 @@ input_files:
     project: '[% c("var/compiler") %]'
     enable: '[% ! c("var/linux") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
+    enable: '[% ! c("var/android") %]'
+    name: go
+    sha256sum: 763ad4bafb80a9204458c5fa2b8e7327fa971aee454252c0e362c11236156813
+  - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
+    enable: '[% c("var/android") %]'
     name: go
     sha256sum: efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
diff --git a/projects/openssl/config b/projects/openssl/config
index 57f67ef..920415f 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.1.1n
+version: 1.1.1o
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -31,4 +31,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-    sha256sum: 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
+    sha256sum: 9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 475d2e8..43eebbd 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -3,15 +3,17 @@ Tor Browser 11.5a10 - April 26 2022
     * Update Fenix to 99.03b
     * Update NoScript to 11.4.5
     * Update Tor to 0.4.7.7
-    * Update OpenSSL to 1.1.1n
+    * Update OpenSSL to 1.1.1o
     * Bug 40212: Tor Browser crashing on launch [fenix]
     * Bug 40433: Bump LLVM to 13.0.1 for android builds [tor-browser-build]
     * Bug 40469: Update zlib to 1.2.12 (CVE-2018-25032) [tor-browser-build]
     * Bug 40470: Fix zlib build issue for android [tor-browser-build]
+    * Bug 40682: Set network.proxy.allow_bypass to false [tor-browser]
     * Bug 40830: cherry-picked Bugzilla 1760674 on GV 99 TBA 11.5 [tor-browser]
  * Build System
    * Android
      * Update Go to 1.18.1
+     * Bug 40485: Resolve Android reproducibility issues [tor-browser-build]
 
 Tor Browser 11.5a9 - April 12 2022
 * Windows + OS X + Linux
diff --git a/rbm.conf b/rbm.conf
index cdb8283..78f64ae 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -67,7 +67,7 @@ buildconf:
 
 var:
   torbrowser_version: '11.5a10'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 11.5a8
   project_name: tor-browser

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.