August 2019 - tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.5] 5af627e10e6ab2da4dd24e8321cd2c933481d4ba
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 0dfb0a6602c5608721ddf14f8f30c6a4d57537d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 07:40:14 2019 +0000 5af627e10e6ab2da4dd24e8321cd2c933481d4ba --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 881b143..1581cc2 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: f81e8f61fd83367aead34ae0ce3b397d2ed6a494 +git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Pick up fix for #31357
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 5af627e10e6ab2da4dd24e8321cd2c933481d4ba Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 27 07:36:27 2019 +0000 Pick up fix for #31357 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index e269704..9a90ebd 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: f81e8f61fd83367aead34ae0ce3b397d2ed6a494 +git_hash: e7ca52e09c9bad0635ad1f2e77a23534f071b53c git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-android-service/master] Remove default bridge.
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit e7ca52e09c9bad0635ad1f2e77a23534f071b53c Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Aug 6 12:33:37 2019 -0700 Remove default bridge. The operator's server contract expires at the end of August. This fixes <https://bugs.torproject.org/31357>. --- service/src/main/assets/common/bridges.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 353ada5..c1c00a6 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -1,5 +1,4 @@ obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 -obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0 obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1 obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1

1 0

[tor-browser-build/master] Remove default bridge.
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit baf55154a76c0c593eda2857906e0d2a1671a4d7 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Aug 6 12:21:41 2019 -0700 Remove default bridge. The operator's server contract expires at the end of August. This fixes <https://bugs.torproject.org/31357>. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 4eb4644..3405a53 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -3,16 +3,15 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.3"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-8.5] Remove default bridge.
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit fa9325b3cc143ce7b72308ad4727fb0a96268915 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Aug 6 12:21:41 2019 -0700 Remove default bridge. The operator's server contract expires at the end of August. This fixes <https://bugs.torproject.org/31357>. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 4eb4644..3405a53 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -3,16 +3,15 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.4"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.3"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 [2001:470:b381:bfff:216:3eff:fe23:d6c3]:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-8.5] Bug 31465: Bump Go to 1.12.9
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit c8b281ca4609c3d86b30f102f90a26440679c3ea Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 20 08:17:15 2019 +0000 Bug 31465: Bump Go to 1.12.9 This is not only a fix for macOS notarization related issues but picks up security fixes as well (see: #31456). --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c039b04..34aea9a 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.11.5 +version: 1.12.9 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -87,7 +87,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e + sha256sum: ab0e56ed9c4732a653ed22e232652709afbf573e710f56a07f7fdeca578d62fc - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/maint-8.5] Bug 28119: Tor Browser for aarch64
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 1eeda4986c5f88f07bf53a2801e9e32ba3dba80b 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 0c3b280..e2b0999 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 831f918..0ad63c1 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 fteproxy: 0 container:

1 0

[torbutton/maint-2.1] Bug 31140 - Do not enable IonMonkey at low security level on AARCH64
by gk＠torproject.org 27 Aug '19

27 Aug '19

commit 2a15af35080b9723d88e5111151f8cd889d592e0 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Aug 19 16:18:40 2019 +0000 Bug 31140 - Do not enable IonMonkey at low security level on AARCH64 --- src/modules/security-prefs.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fa97b70d..94480123 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -5,6 +5,11 @@ let {classes: Cc, utils: Cu } = Components; let { getBoolPref, setBoolPref, getIntPref, setIntPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; + +// Used for detecting the current system architecture +let { XPCOMABI } = + Cu.import("resource://gre/modules/Services.jsm", {}).Services.appinfo; + let { bindPref, bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); let logger = Components.classes["@torproject.org/torbutton-logger;1"] @@ -41,8 +46,16 @@ const kCustomPref = "extensions.torbutton.security_custom"; // to the pref database. var write_setting_to_prefs = function (settingIndex) { Object.keys(kSecuritySettings).forEach( - prefName => setBoolPref( - prefName, kSecuritySettings[prefName][settingIndex])); + prefName => { + // Bug 31140 - Do not enable IonMonkey on AARCH64. + if (XPCOMABI.split("-")[0] == "aarch64" && + prefName == "javascript.options.ion") { + setBoolPref(prefName, false); + continue; + } + setBoolPref( + prefName, kSecuritySettings[prefName][settingIndex]); + }); }; // __read_setting_from_prefs()__.

1 0

[tor-browser/tor-browser-68.0esr-9.0-3] Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD
by gk＠torproject.org 26 Aug '19

26 Aug '19

commit 39af5f2d4da655d6cb7bb5c411272634a4cdf039 Author: Adam Gashlin <agashlin(a)mozilla.com> Date: Mon Aug 19 15:44:42 2019 -0700 Bug 1572844 - Consistently check for MOZ_BITS_DOWNLOAD --- toolkit/components/bitsdownload/components.conf | 2 +- toolkit/components/bitsdownload/moz.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/components/bitsdownload/components.conf b/toolkit/components/bitsdownload/components.conf index d8a7b5721e00..fe7090d366be 100644 --- a/toolkit/components/bitsdownload/components.conf +++ b/toolkit/components/bitsdownload/components.conf @@ -5,7 +5,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. Classes = [] -if buildconfig.substs['OS_ARCH'] == 'WINNT' and defined('MOZ_BITS_DOWNLOAD'): +if defined('MOZ_BITS_DOWNLOAD'): Classes += [ { 'cid': '{495d6f3d-9748-4d30-8ce5-0290c0001edf}', diff --git a/toolkit/components/bitsdownload/moz.build b/toolkit/components/bitsdownload/moz.build index 1d3f45937bdb..5f1dc96e9490 100644 --- a/toolkit/components/bitsdownload/moz.build +++ b/toolkit/components/bitsdownload/moz.build @@ -14,7 +14,7 @@ XPCOM_MANIFESTS += [ 'components.conf', ] -if CONFIG['OS_ARCH'] == 'WINNT': +if CONFIG['MOZ_BITS_DOWNLOAD']: EXPORTS += [ 'Bits.h' ]

1 0

[tor-browser-build/master] Bug 31447: Update comment about python package
by gk＠torproject.org 24 Aug '19

24 Aug '19

commit ace69bc2a6abb9bc5aaba625eb9a693ae2e2a5c7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 19 18:45:32 2019 +0200 Bug 31447: Update comment about python package --- projects/firefox/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index a481815..a5851fa 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -20,7 +20,9 @@ var: - zip - autoconf2.13 - yasm - # XXX: for mach + # We are building our own version of Python 3.6, which is required + # for the build. However mach still requires Python 2.7, so we + # install this version using the package. - python - pkg-config container:

1 0