July 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit 2a42d6be2707bbc28ad9d68055799297d1d07daf Merge: afa2c39ba 1dd952789 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 1 14:25:12 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket28795 | 5 + src/app/config/fallback_dirs.inc | 567 ++++++++++++++++++--------------------- 2 files changed, 266 insertions(+), 306 deletions(-)

1 0

[tor/release-0.4.0] fallback: apply the second fallback list from 2019
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit f3b2a81ce734828aeba50e8d1eb19c8c4575fdb6 Author: teor <teor(a)torproject.org> Date: Fri Jun 28 21:16:50 2019 +1000 fallback: apply the second fallback list from 2019 Update the fallback directory mirrors by merging the current list with: fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc Part of 28795, see that ticket for logs. --- src/or/fallback_dirs.inc | 71 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/src/or/fallback_dirs.inc b/src/or/fallback_dirs.inc index d1deaf181..793f65ce8 100644 --- a/src/or/fallback_dirs.inc +++ b/src/or/fallback_dirs.inc @@ -1,22 +1,47 @@ /* type=fallback */ /* version=2.0.0 */ /* timestamp=20190625114911 */ +/* timestamp0=20190625114911 */ +/* timestamp1=20190628085927 */ /* source=whitelist */ /* ===== */ -/* Whitelist excluded 1550 of 1711 candidates. */ +/* 0: Whitelist excluded 1550 of 1711 candidates. */ +/* 1: Whitelist excluded 1601 of 1765 candidates. */ /* Checked IPv4 DirPorts served a consensus within 15.0s. */ /* +0: Final Count: 140 (Eligible 161, Target 414 (2072 * 0.20), Max 200) Excluded: 21 (Same Operator 16, Failed/Skipped Download 3, Excess 2) Bandwidth Range: 0.5 - 54.5 MByte/s + +MERGED WITH: + +1: +Final Count: 140 (Eligible 164, Target 414 (2073 * 0.20), Max 200) +Excluded: 24 (Same Operator 16, Failed/Skipped Download 4, Excess 4) +Bandwidth Range: 0.8 - 54.5 MByte/s */ /* +): Onionoo Source: details Date: 2019-06-25 10:00:00 Version: 7.0 URL: https:onionoo.torproject.orgdetails?fieldsfingerprint%2Cnickname%2Ccontact%2Clast_changed_address_or_port%2Cconsensus_weight%2Cadvertised_bandwidth%2Cor_addresses%2Cdir_address%2Crecommended_version%2Cflags%2Ceffective_family%2Cplatform&flagV2Dir&typerelay&last_seen_days-0&first_seen_days90- + +MERGED WITH: + +1: +Onionoo Source: details Date: 2019-06-28 07:00:00 Version: 7.0 +URL: https:onionoo.torproject.orgdetails?fieldsfingerprint%2Cnickname%2Ccontact%2Clast_changed_address_or_port%2Cconsensus_weight%2Cadvertised_bandwidth%2Cor_addresses%2Cdir_address%2Crecommended_version%2Cflags%2Ceffective_family%2Cplatform&last_seen_days-0&flagV2Dir&first_seen_days90-&typerelay&order-consensus_weight%2Cfirst_seen */ /* +0: Onionoo Source: uptime Date: 2019-06-25 10:00:00 Version: 7.0 URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&last_seen_days-0 + +MERGED WITH: + +1: +Onionoo Source: uptime Date: 2019-06-28 07:00:00 Version: 7.0 +URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&order-consensus_weight%2Cfirst_seen&last_seen_days-0 */ /* ===== */ "185.13.39.197:80 orport=443 id=001524DD403D729F08F7E5D77813EF12756CFA8D" @@ -255,6 +280,12 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"50.7.74.170:80 orport=443 id=5BF17163CBE73D8CD9FDBE030C944EA05707DA93" +" ipv6=[2001:49f0:d002:2::58]:443" +/* nickname=theia8 */ +/* extrainfo=0 */ +/* ===== */ +, "172.98.193.43:80 orport=443 id=5E56738E7F97AA81DEEF59AF28494293DFBFCCDF" /* nickname=Backplane */ /* extrainfo=0 */ @@ -312,6 +343,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"77.247.181.166:80 orport=443 id=77131D7E2EC1CA9B8D737502256DA9103599CE51" +/* nickname=CriticalMass */ +/* extrainfo=0 */ +/* ===== */ +, "5.196.23.64:9030 orport=9001 id=775B0FAFDE71AADC23FFC8782B7BEB1D5A92733E" /* nickname=Aerodynamik01 */ /* extrainfo=0 */ @@ -333,6 +369,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"185.220.101.48:10048 orport=20048 id=7E281CD2C315C4F7A84BC7C8721C3BC974DDBFA3" +/* nickname=niftyporcupine */ +/* extrainfo=0 */ +/* ===== */ +, "193.11.114.45:9031 orport=9002 id=80AAF8D5956A43C197104CEF2550CD42D165C6FB" /* nickname=mdfnet2 */ /* extrainfo=0 */ @@ -452,6 +493,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"185.220.101.49:10049 orport=20049 id=9B816A5B3EB20B8E4E9B9D1FBA299BD3F40F0320" +/* nickname=niftypygmyjerboa */ +/* extrainfo=0 */ +/* ===== */ +, "86.105.212.130:9030 orport=443 id=9C900A7F6F5DD034CFFD192DAEC9CCAA813DB022" /* nickname=firstor2 */ /* extrainfo=0 */ @@ -514,6 +560,12 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"5.9.147.226:9030 orport=9001 id=B0553175AADB0501E5A61FC61CEA3970BE130FF2" +" ipv6=[2a01:4f8:190:30e1::2]:9001" +/* nickname=zwiubel */ +/* extrainfo=0 */ +/* ===== */ +, "178.17.174.14:9030 orport=9001 id=B06F093A3D4DFAD3E923F4F28A74901BD4F74EB1" " ipv6=[2a00:1dc0:caff:8b::5b9a]:9001" /* nickname=TorExitMoldova */ @@ -662,6 +714,12 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"50.7.74.174:80 orport=443 id=D50101A2ABD09DC245F7E96C0818D003CDD62351" +" ipv6=[2001:49f0:d002:2::56]:443" +/* nickname=theia6 */ +/* extrainfo=0 */ +/* ===== */ +, "37.187.115.157:9030 orport=9001 id=D5039E1EBFD96D9A3F9846BF99EC9F75EDDE902A" /* nickname=Janky328891 */ /* extrainfo=0 */ @@ -688,6 +746,12 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"178.33.183.251:80 orport=443 id=DD823AFB415380A802DCAEB9461AE637604107FB" +" ipv6=[2001:41d0:2:a683::251]:443" +/* nickname=grenouille */ +/* extrainfo=0 */ +/* ===== */ +, "171.25.193.20:80 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02" " ipv6=[2001:67c:289c::20]:443" /* nickname=DFRI0 */ @@ -705,6 +769,11 @@ URL: https:onionoo.torproject.orguptime?first_seen_days90-&flagV2Dir&typerelay&l /* extrainfo=0 */ /* ===== */ , +"185.100.86.182:9030 orport=8080 id=E51620B90DCB310138ED89EDEDD0A5C361AAE24E" +/* nickname=NormalCitizen */ +/* extrainfo=0 */ +/* ===== */ +, "212.47.244.38:8080 orport=443 id=E81EF60A73B3809F8964F73766B01BAA0A171E20" /* nickname=Chimborazo */ /* extrainfo=0 */

1 0

[tor/release-0.4.0] changes: file for 28795
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit fb977f8cac99c008f11e054f07b8c4be5fc5a0c5 Author: teor <teor(a)torproject.org> Date: Fri Jun 28 21:37:37 2019 +1000 changes: file for 28795 Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc in December 2018 (of which ~122 were still functional), with a list of 148 fallbacks (70 new, 78 existing, 79 removed) generated in June 2019. Closes ticket 28795. Note that we created extra lists from DE and US, but they didn't add any more fallbacks when we tried to merge them. --- changes/ticket28795 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket28795 b/changes/ticket28795 new file mode 100644 index 000000000..6ae72562b --- /dev/null +++ b/changes/ticket28795 @@ -0,0 +1,5 @@ + o Minor features (fallback directory list): + - Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc + in December 2018 (of which ~122 were still functional), with a + list of 148 fallbacks (70 new, 78 existing, 79 removed) generated + in June 2019. Closes ticket 28795.

1 0

[tor/release-0.3.5] changes: file for 28795
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit fb977f8cac99c008f11e054f07b8c4be5fc5a0c5 Author: teor <teor(a)torproject.org> Date: Fri Jun 28 21:37:37 2019 +1000 changes: file for 28795 Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc in December 2018 (of which ~122 were still functional), with a list of 148 fallbacks (70 new, 78 existing, 79 removed) generated in June 2019. Closes ticket 28795. Note that we created extra lists from DE and US, but they didn't add any more fallbacks when we tried to merge them. --- changes/ticket28795 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket28795 b/changes/ticket28795 new file mode 100644 index 000000000..6ae72562b --- /dev/null +++ b/changes/ticket28795 @@ -0,0 +1,5 @@ + o Minor features (fallback directory list): + - Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc + in December 2018 (of which ~122 were still functional), with a + list of 148 fallbacks (70 new, 78 existing, 79 removed) generated + in June 2019. Closes ticket 28795.

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit 5e1660100027e742c39c073c84add64e093f7745 Merge: 3ccf91027 2a42d6be2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 1 14:25:12 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket28795 | 5 + src/app/config/fallback_dirs.inc | 567 ++++++++++++++++++--------------------- 2 files changed, 266 insertions(+), 306 deletions(-)

1 0

[torspec/master] dir-list: add a source line to the dir-list header
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit e9627a9e5355b4801b1e7f0f4ae2f457c5f40325 Author: teor <teor(a)torproject.org> Date: Sun Jun 23 16:47:56 2019 +1000 dir-list: add a source line to the dir-list header And create a new minor format version 2.1.0. Closes 30949. --- dir-list-spec.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dir-list-spec.txt b/dir-list-spec.txt index 3087246..1072904 100644 --- a/dir-list-spec.txt +++ b/dir-list-spec.txt @@ -68,6 +68,8 @@ 2.0.0 - Adds name and extrainfo structured comments, and section separator comments to make the list easier to parse. + 2.1.0 - Adds a source list comment to the header. + 2. Format Details Directory lists contain the following sections: @@ -174,6 +176,20 @@ The current timestamp format is YYYYMMDDHHMMSS, as an integer. + "/*" SP+ "source=" Keyword SP+ "*/" SP* NL + + [Zero or one time.] + + The source of the directory entries in the list. + + As of version 2.1.0, the sources are: + * "whitelist" - the fallback.whitelist file in the fallback-scripts + repository. This is the default. + * "fallback" - a fallback_dirs.inc file from a tor repository. + Used in check_existing mode. + + This line was added in version 2.1.0 of this specification. + "/*" SP+ key_value SP+ "*/" SP* NL [Zero or more times.]

1 0

[torspec/master] dir-list: explain semantic versioning in the Format Versions section
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit 284c6ca0e5287f8bf67bf53d82a787d0ceafd227 Author: teor <teor(a)torproject.org> Date: Sun Jun 23 16:48:51 2019 +1000 dir-list: explain semantic versioning in the Format Versions section It's better to explain before we start talking about versions. Cleanup after 30949. --- dir-list-spec.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dir-list-spec.txt b/dir-list-spec.txt index 1072904..9afef93 100644 --- a/dir-list-spec.txt +++ b/dir-list-spec.txt @@ -63,6 +63,16 @@ 1.3. Format Versions + The directory list format uses semantic versioning: https://semver.org + + In particular: + * major versions are used for incompatible changes, like + removing non-optional fields + * minor versions are used for compatible changes, like adding + fields + * patch versions are for bug fixes, like fixing an + incorrectly-formatted Summary item + 1.0.0 - The legacy fallback directory list format 2.0.0 - Adds name and extrainfo structured comments, and section separator @@ -151,16 +161,10 @@ [In second position, exactly once.] - The version of the directory list format. version_number uses - semantic versioning: https://semver.org + The version of the directory list format. - In particular: - * major versions are used for incompatible changes, like - removing non-optional fields - * minor versions are used for compatible changes, like adding - fields - * patch versions are for bug fixes, like fixing an - incorrectly-formatted Summary item + version_number is a semantic version, see the "Format Versions" + section for details. Version 1.0.0 represents the undocumented, legacy fallback list format(s). Version 2.0.0 and later are documented by this

1 0

[torspec/master] dir-list: Add a Future Plans section
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit b940965ea52ed75d58824bbc159beedff827bf5f Author: teor <teor(a)torproject.org> Date: Sun Jun 23 16:49:58 2019 +1000 dir-list: Add a Future Plans section Based on our plans in 24818 and 24839. --- dir-list-spec.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dir-list-spec.txt b/dir-list-spec.txt index 9afef93..037319d 100644 --- a/dir-list-spec.txt +++ b/dir-list-spec.txt @@ -80,6 +80,20 @@ 2.1.0 - Adds a source list comment to the header. +1.4. Future Plans + + Tor also has an auth_dirs.inc file, but it is not yet in this format. + Tor uses slightly different formats for authorities and fallback + directory mirrors, so we will need to make some changes to tor so that + it parses this format. (We will also need to add authority-specific + information to this format.) See #24818 for details. + + We want to add a torrc option so operators can opt-in their relays as + fallback directory mirrors. This gives us a signed opt-in confirmation. + (We can also continue to accept whitelist entries, and do other checks.) + We need to write a short proposal, and make some changes to tor and the + fallback update script. See #24839 for details. + 2. Format Details Directory lists contain the following sections:

1 0

[torspec/master] Merge remote-tracking branch 'tor-github/pr/84'
by nickm＠torproject.org 01 Jul '19

01 Jul '19

commit 438aed98a0616a364b5e632fea74c5024010f1a3 Merge: 4707f36 b940965 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 1 14:19:23 2019 -0400 Merge remote-tracking branch 'tor-github/pr/84' dir-list-spec.txt | 52 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 9 deletions(-)

1 0

[tor-browser-build/master] Bug 28119: Tor Browser for aarch64
by boklm＠torproject.org 01 Jul '19

01 Jul '19

commit d226510faec5480997adcdc3c1c6aee1952d92e5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 31 13:01:30 2019 +0000 Bug 28119: Tor Browser for aarch64 Thanks to boklm for help with this patch. --- Makefile | 15 +++++++++ projects/android-toolchain/build | 8 ++--- projects/firefox/mozconfig-android-aarch64 | 50 ++++++++++++++++++++++++++++++ projects/release/build | 3 ++ projects/release/config | 10 ++++++ projects/rust/config | 4 +++ projects/tor-browser/build.android | 9 ++++-- rbm.conf | 14 ++++++++- 8 files changed, 104 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 285b49d..94a26f6 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ release-android-armv7: submodule-update release-android-x86: submodule-update $(rbm) build release --target release --target torbrowser-android-x86 +release-android-aarch64: submodule-update + $(rbm) build release --target release --target torbrowser-android-aarch64 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -41,6 +44,9 @@ alpha-android-armv7: submodule-update alpha-android-x86: submodule-update $(rbm) build release --target alpha --target torbrowser-android-x86 +alpha-android-aarch64: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-aarch64 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -71,6 +77,9 @@ nightly-android-armv7: submodule-update nightly-android-x86: submodule-update $(rbm) build release --target nightly --target torbrowser-android-x86 +nightly-android-aarch64: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-aarch64 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -101,6 +110,9 @@ alpha_nightly-android-armv7: submodule-update alpha_nightly-android-x86: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 +alpha_nightly-android-aarch64: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -128,6 +140,9 @@ testbuild-android-armv7: submodule-update testbuild-android-x86: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-x86 +testbuild-android-aarch64: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-aarch64 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 9fe40f7..e0f59a9 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -18,11 +18,9 @@ cd $NDK_HOME mv android-ndk-r15c/* . rm -fR android-ndk-r15c -# The architectures we support -archs="arm x86" -for arch in $archs; do - ./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api") %] --arch $arch --install-dir=./$arch -done +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86 +./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64 # Tool Archives cd $SDK_HOME diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 new file mode 100644 index 0000000..2a9eb67 --- /dev/null +++ b/projects/firefox/mozconfig-android-aarch64 @@ -0,0 +1,50 @@ +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-aarch64-linux-android +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options --enable-official-branding + +ac_add_options --enable-application=mobile/android +ac_add_options --target=aarch64-linux-android +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk +ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux +ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle +ac_add_options --with-android-version=21 + +# Android NDK does not contain llvm-config so set clang path in options +ac_add_options --with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm64/lib64 +ac_add_options --with-clang-path=/var/tmp/dist/android-toolchain/android-ndk/arm64/bin/clang + +ac_add_options --with-android-distribution-directory=@TOPSRCDIR@/mobile/android/torbrowser +ac_add_options --with-l10n-base=/var/tmp/dist/locales + +# We do not use Tor Launcher on Android: +ac_add_options --disable-tor-launcher + +if [ -z "${TB_BUILD_WITH_UPDATER}" ]; then +# Because Google Play will likely be the primary distribution medium, +# we disable updating and rely on Google Play by default. The +# Developer Policy explicitly prohibits in-app updating: +# An app distributed via Google Play may not modify, replace, or +# update itself using any method other than Google Plays update +# mechanism. +# https://play.google.com/about/privacy-security-deception/malicious-behavior/ + + ac_add_options --disable-tor-browser-update + ac_add_options --disable-signmar + ac_add_options --disable-verify-mar +fi + +ac_add_options --enable-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-rust-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc + +ac_add_options --without-google-play-services + +# Let's make sure no preference is enabling either Adobe's or Google's CDM. +ac_add_options --disable-eme diff --git a/projects/release/build b/projects/release/build index af9d673..3e930e0 100644 --- a/projects/release/build +++ b/projects/release/build @@ -10,6 +10,9 @@ mkdir -p "$destdir" [% IF c("var/torbrowser-android-x86") -%] mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ [% END -%] +[% IF c("var/torbrowser-android-aarch64") -%] + mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index ddb17d1..1623083 100644 --- a/projects/release/config +++ b/projects/release/config @@ -24,6 +24,9 @@ targets: torbrowser-android-x86: var: torbrowser-android-x86: 1 + torbrowser-android-aarch64: + var: + torbrowser-android-aarch64: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -117,6 +120,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-android-x86 + - name: android-aarch64 + project: tor-browser + enable: '[% c("var/torbrowser-android-aarch64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-aarch64 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]' diff --git a/projects/rust/config b/projects/rust/config index 2ed48c0..d784d39 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -30,6 +30,10 @@ targets: var: configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=i686-linux-android --set=target.i686-linux-android.cc=$ANDROID_NDK_HOME/x86/bin/i686-linux-android-gcc + android-aarch64: + var: + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=aarch64-linux-android --set=target.aarch64-linux-android.cc=$ANDROID_NDK_HOME/arm64/bin/aarch64-linux-android-gcc + linux: var: rust_arch: x86_64 diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index be36abc..b90c8b9 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -24,13 +24,16 @@ zip -d $apk lib/\* zip_src => [ 'lib/x86/*' ], zip_args => '$apk', }) %] -[% END %] - -[% IF c("var/android-armv7") %] +[% ELSIF c("var/android-armv7") %] [% c('zip', { zip_src => [ 'lib/armeabi-v7a/*' ], zip_args => '$apk', }) %] +[% ELSIF c("var/android-aarch64") %] + [% c('zip', { + zip_src => [ 'lib/arm64-v8a/*' ], + zip_args => '$apk', + }) %] [% END %] rm -fR lib diff --git a/rbm.conf b/rbm.conf index 657ce31..62a19a6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -190,12 +190,24 @@ targets: var: android-x86: 1 osname: android-x86 + torbrowser-android-aarch64: + - android-aarch64 + - android + android-aarch64: + arch: aarch64 + var: + android-aarch64: 1 + osname: android-aarch64 android: var: android: 1 compiler: android-toolchain # API 16 is the minimum we currently support for Tor Browser on Android - android_min_api: 16 + android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]' + # API 21 is the minimum we currently support for arm64 on Android + android_min_api_aarch64: 21 + android_min_api_armv7: 16 + android_min_api_x86: 16 snowflake: 0 container: suite: stretch

1 0