commit a96f2b85d69df138a79301dc676a4c6d7eecada4 Merge: 1f62dec 062f0d0 Author: Matthew Finkel sysrqb@torproject.org Date: Wed Dec 2 20:28:24 2020 +0000

Merge remote-tracking branch 'gkgl/bug_40156_v6'

projects/android-components/build | 13 +- projects/android-components/config | 11 +- .../gradle-dependencies-list.txt | 88 +- projects/application-services/40085.patch | 22 - projects/application-services/build | 22 +- projects/application-services/config | 19 +- .../gradle-dependencies-list.txt | 282 +++--- .../application-services/update-cargo-lock.patch | 976 +++++++++++++++++++++ .../application-services/viaduct-workaround.patch | 32 + .../application-services/viaduct-workaround2.patch | 660 ++++++++++++++ projects/fenix/config | 5 +- projects/fenix/gradle-dependencies-list.txt | 501 ++++++----- projects/geckoview/config | 5 +- projects/geckoview/gradle-dependencies-list.txt | 6 +- projects/gradle/build | 8 + projects/gradle/config | 18 + projects/nss/config | 6 +- projects/rust/build | 12 +- projects/rust/config | 9 +- projects/uniffi-rs/build | 34 + projects/uniffi-rs/config | 17 + 21 files changed, 2246 insertions(+), 500 deletions(-)