[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40061_v5'

[sysrqb@xxxxxxxxxxxxxx]

commit 689c9c66626510fc9d19268330469ee98dce55ed
Merge: f6b8950 3dad656
Author: Matthew Finkel <sysrqb@xxxxxxxxxxxxxx>
Date:   Tue Sep 1 19:48:16 2020 +0000

    Merge remote-tracking branch 'gkgl/bug_40061_v5'

 projects/android-components/build                  |  52 ++
 projects/android-components/config                 |  37 +
 projects/android-components/git.patch              |  22 +
 .../gradle-dependencies-list.txt                   | 937 +++++++++++++++++++++
 projects/android-components/mavenLocal.patch       |  83 ++
 projects/android-toolchain/build                   |  51 +-
 projects/android-toolchain/config                  |  53 +-
 projects/application-services/1651660.patch        | 811 ++++++++++++++++++
 projects/application-services/build                | 103 +++
 projects/application-services/config               |  86 ++
 .../gradle-dependencies-list.txt                   | 427 ++++++++++
 projects/application-services/mavenLocal.patch     |  53 ++
 projects/application-services/no-git.patch         |  23 +
 projects/application-services/target.patch         |  21 +
 .../how-to-create-gradle-dependencies-list.txt     |  12 +-
 projects/fenix-android-toolchain/build             |  72 --
 projects/fenix-android-toolchain/config            |  70 --
 projects/fenix-rust/config                         |   2 +-
 projects/fenix-tor-android-service/build           |  30 -
 projects/fenix-tor-android-service/config          |  26 -
 .../gradle-dependencies-list.txt                   | 301 -------
 .../0001-Bug-30318-Add-snowflake-support.patch     |  90 --
 ...ug-33931-Filter-bridges-in-stream-by-type.patch |  76 --
 projects/fenix-tor-onion-proxy-library/build       |  45 -
 projects/fenix-tor-onion-proxy-library/config      |  31 -
 .../gradle-dependencies-list.txt                   | 303 -------
 .../fenix-tor-onion-proxy-library/gradle.patch     |  72 --
 projects/fenix/build                               |  48 ++
 projects/fenix/config                              |  49 ++
 projects/fenix/gradle-dependencies-list.txt        | 857 +++++++++++++++++++
 projects/fenix/mavenLocal.patch                    |  71 ++
 projects/firefox/build                             |  57 +-
 projects/firefox/config                            |  25 +-
 projects/geckoview/config                          |   8 +-
 projects/geckoview/mozconfig-android-aarch64       |   6 +-
 projects/geckoview/mozconfig-android-all           |   4 +-
 projects/geckoview/mozconfig-android-armv7         |   6 +-
 projects/geckoview/mozconfig-android-x86           |   6 +-
 projects/geckoview/mozconfig-android-x86_64        |   6 +-
 projects/go/build                                  |   6 +-
 projects/nss/build                                 |  26 +-
 projects/nss/config                                |   6 +-
 projects/openssl/build                             |   4 -
 projects/openssl/config                            |   2 +-
 projects/sqlcipher/build                           |  24 +-
 projects/sqlcipher/config                          |   4 +-
 projects/tor-android-service/build                 |   6 +-
 projects/tor-android-service/config                |   5 +-
 .../gradle-dependencies-list.txt                   | 335 ++++----
 projects/tor-onion-proxy-library/build             |   3 +-
 projects/tor-onion-proxy-library/config            |   2 +-
 .../gradle-dependencies-list.txt                   | 335 ++++----
 projects/tor-onion-proxy-library/gradle.patch      |  67 +-
 projects/tor/build                                 |   6 +-
 projects/tor/config                                |   2 +-
 projects/zlib/build                                |   9 +-
 projects/zstd/build                                |   6 +-
 rbm.conf                                           |  56 +-
 58 files changed, 4255 insertions(+), 1681 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits