[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40312+40321_v3'

[sysrqb at torproject.org]

commit 3226747cc0f0bb1896088a0f1e7960d59dea8cfa
Merge: b3b17e0 43fea29
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Jul 2 17:33:59 2021 +0000

    Merge remote-tracking branch 'boklmgl/bug_40312+40321_v3'

 Makefile                                           |   2 +-
 projects/android-components/build                  |  17 +-
 projects/android-components/config                 |  12 +-
 .../gradle-dependencies-list.txt                   | 138 +--
 projects/application-services/build                |   9 +-
 projects/application-services/config               |  41 +-
 .../gradle-dependencies-list.txt                   | 117 +--
 .../list_toolchain_updates_checks                  |  25 +-
 .../application-services/update-cargo-lock.patch   | 947 ---------------------
 .../application-services/viaduct-workaround.patch  |  32 -
 projects/fenix/config                              |  14 +-
 projects/fenix/gradle-dependencies-list.txt        | 452 +++++-----
 projects/geckoview/config                          |   8 +-
 projects/glean/config                              |   2 +-
 projects/llvm-project/config                       |   4 +-
 projects/rust/config                               |   4 +-
 rbm.conf                                           |   2 +
 17 files changed, 438 insertions(+), 1388 deletions(-)