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

[tor-browser-build/master] Remove six defunct default bridges.
by gk＠torproject.org 10 May '19

10 May '19

commit a756b1373b67588eea29e3b02310d14f506405f9 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu May 9 12:44:25 2019 -0700 Remove six defunct default bridges. All of these bridges are long gone and have no business still being in Tor Browser. This fixes <https://bugs.torproject.org/30457>. --- .../Bundle-Data/PTConfigs/bridge_prefs.js | 61 ++++++++++------------ 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 8da9588..a738b74 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -2,42 +2,35 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); // Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); - -pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.obfs4.1", "obfs4 154.35.22.10:15937 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 192.99.11.54:443 7B126FAB960E5AC6A629C729434FF84FB5074EC2 cert=VW5f8+IBUWpPFxF+rsiVy2wXkyTQG7vEd+rHeN2jV5LIDNu8wMNEOqZXPwHdwMVEBdqXEw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); -pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); -/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.20"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.21", "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.22", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); -pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.26", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.27", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.2", "obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.3", "obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=2"); +pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 154.35.22.11:16488 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 154.35.22.10:80 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 154.35.22.10:443 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 154.35.22.11:443 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 154.35.22.11:80 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 154.35.22.9:12166 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 154.35.22.9:80 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 154.35.22.9:443 C73ADBAC8ADFDBF0FC0F3F4E8091C0107D093716 cert=gEGKc5WN/bSjFa6UkG9hOcft1tuK+cV8hbZ0H6cqXiMPLqSbCh2Q3PHe5OOr6oMVORhoJA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.17", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.18", "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1"); +/**/pref/**/(/**/"extensions.torlauncher.default_bridge.obfs4.19"/**/, /**/"obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.20", "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.21", "obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1"); +pref("extensions.torlauncher.default_bridge.obfs4.22", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.23", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.24", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.25", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.26", "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/master] Bug 30377: Remove selfrando from our build system
by boklm＠torproject.org 09 May '19

09 May '19

commit 9f2de1690a822e1933356065010378f60ea2cf2c Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 9 17:22:27 2019 +0000 Bug 30377: Remove selfrando from our build system --- keyring/elfutils.gpg | Bin 10483 -> 0 bytes keyring/selfrando.gpg | Bin 2759 -> 0 bytes projects/elfutils/build | 23 --------------- projects/elfutils/config | 22 --------------- projects/firefox/build | 12 -------- projects/firefox/config | 7 ----- projects/selfrando/build | 25 ----------------- projects/selfrando/config | 31 --------------------- .../tor-browser/RelativeLink/start-tor-browser | 4 --- rbm.conf | 1 - 10 files changed, 125 deletions(-) diff --git a/keyring/elfutils.gpg b/keyring/elfutils.gpg deleted file mode 100644 index f1cd4b3..0000000 Binary files a/keyring/elfutils.gpg and /dev/null differ diff --git a/keyring/selfrando.gpg b/keyring/selfrando.gpg deleted file mode 100644 index 276955d..0000000 Binary files a/keyring/selfrando.gpg and /dev/null differ diff --git a/projects/elfutils/build b/projects/elfutils/build deleted file mode 100644 index 5e24dba..0000000 --- a/projects/elfutils/build +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -mkdir -p /var/tmp/dist - -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" - -mkdir -p /var/tmp/build -tar -C /var/tmp/build -xf $rootdir/[% c('input_files_by_name/elfutils') %] - -cd /var/tmp/build/[% project %]-[% c("version") %] -./configure --prefix="$distdir" -make -j[% c("buildconf/num_procs") %] -make install - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/elfutils/config b/projects/elfutils/config deleted file mode 100644 index 2c21cf2..0000000 --- a/projects/elfutils/config +++ /dev/null @@ -1,22 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '0.166' -filename: 'elfutils-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -tag_gpg_id: 1 - -var: - container: - use_container: 1 - arch_deps: - - zlib1g-dev - -input_files: - - project: container-image - - name: elfutils - URL: 'https://sourceware.org/elfutils/ftp/[% c("version") %]/elfutils-[% c("version") %].tar.bz2' - file_gpg_id: 1 - gpg_keyring: elfutils.gpg - sig_ext: sig - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: binutils - name: binutils diff --git a/projects/firefox/build b/projects/firefox/build index 8146f5d..5cf86a4 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -58,14 +58,6 @@ EOF export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] -[% IF c("var/selfrando") -%] - tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/selfrando') %] - # Selfrando wrapper - export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH" - # We need to avoid the shuffling while building as this breaks compilation - export SELFRANDO_skip_shuffle= -[% END -%] - mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" @@ -276,10 +268,6 @@ cd $distdir objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB - [% IF c("var/selfrando") -%] - # remove RUNPATH added by selfrando (see #22242) - chrpath -d $LIB - [% END -%] done [% END %] diff --git a/projects/firefox/config b/projects/firefox/config index 096fca1..566cbc0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -75,8 +75,6 @@ targets: - libx11-xcb-dev # We built GCC but not the libmpc2, thus we need to install it - libmpc2 - # needed to remove RUNPATH added by selfrando (see #22242) - - chrpath linux-i686: var: @@ -95,8 +93,6 @@ targets: - libx11-xcb-dev:i386 # We built GCC but not the libmpc2, thus we need to install it - libmpc2 - # needed to remove RUNPATH added by selfrando (see #22242) - - chrpath - hardening-wrapper osx-x86_64: @@ -128,9 +124,6 @@ input_files: - project: binutils name: binutils enable: '[% c("var/linux") %]' - - project: selfrando - name: selfrando - enable: '[% c("var/selfrando") %]' - filename: fix-info-plist.py enable: '[% c("var/osx") %]' - URL: https://people.torproject.org/~gk/mirrors/sources/msvcr100.dll diff --git a/projects/selfrando/build b/projects/selfrando/build deleted file mode 100644 index 14d9dcf..0000000 --- a/projects/selfrando/build +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -distdir=/var/tmp/dist/[% project %] -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -mkdir -p /var/tmp/dist - -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/elfutils') %] -tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/binutils/bin:$PATH" - -tar -C /var/tmp/dist -xf $rootdir/[% project %]-[% c("version") %].tar.gz - -cd /var/tmp/dist -mv [% project %]-[% c("version") %] [% project %] -cd [% project %] -scons -Q arch=[% c("var/selfrando_arch") %] LIBELF_PATH="/var/tmp/dist/elfutils" NO_MREMAP=1 FORCE_INPLACE=1 DEBUG_LEVEL=env WRITE_LAYOUTS=env LOG=console -# Fix the path where we install selfrando -sed -i 's|^SR_PATH=.*|SR_PATH=/var/tmp/dist/selfrando/out/[% c("var/selfrando_arch") %]/bin|' Tools/TorBrowser/tc-wrapper/ld - -cd /var/tmp/dist -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] diff --git a/projects/selfrando/config b/projects/selfrando/config deleted file mode 100644 index 82acc23..0000000 --- a/projects/selfrando/config +++ /dev/null @@ -1,31 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 0.4.2 -git_hash: 'tb-v[% c("version") %]' -git_url: https://github.com/immunant/selfrando.git -gpg_keyring: selfrando.gpg -tag_gpg_id: 1 - -var: - container: - use_container: 1 - arch_deps: - - scons - - zlib1g-dev - -targets: - linux-x86_64: - var: - selfrando_arch: x86_64 - linux-i686: - var: - selfrando_arch: x86 - -input_files: - - project: container-image - - name: binutils - project: binutils - - name: elfutils - project: elfutils - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 474360b..0a1dcbf 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -273,10 +273,6 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then exit 1 fi -[% IF ! c("var/release") %] -export SELFRANDO_write_layout_file= -[% END %] - [% IF c("var/asan") -%] # We need to disable LSan which is enabled by default now. Otherwise we'll get # a crash during shutdown: https://bugs.torproject.org/10599#comment:59 diff --git a/rbm.conf b/rbm.conf index b9db843..2202776 100644 --- a/rbm.conf +++ b/rbm.conf @@ -238,7 +238,6 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' fteproxy: 1 - selfrando: '[% c("var/linux-x86_64") && ! c("var/release") %]' container: suite: wheezy arch: amd64

1 0

[tor-browser-build/master] Bug 30448: Create the Debug/Browser/gtk2 directory
by gk＠torproject.org 09 May '19

09 May '19

commit 81a689dd863a4be72c4f3301cf571ac4146813f0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 9 14:25:20 2019 +0200 Bug 30448: Create the Debug/Browser/gtk2 directory At the same time, move the creation of the Debug directory closer to where we use it. --- projects/firefox/build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index aefdb97..8146f5d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -84,10 +84,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz mkdir -p $distdir/Browser [% END %] -[% IF c("var/linux") %] - mkdir -p $distdir/Debug/Browser/ -[% END %] - cd /var/tmp/build/[% project %]-[% c("version") %] mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% IF c("var/asan") -%] @@ -272,6 +268,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir [% IF c("var/linux") %] + mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) for LIB in Browser/*.so Browser/gtk2/*.so Browser/firefox.real Browser/plugin-container Browser/updater

1 0

[tor-browser-build/master] Bug 30448: Strip Browser/gtk2/libmozgtk.so
by gk＠torproject.org 09 May '19

09 May '19

commit 8b78ec43a5254776d8d4f3e98ef9f88aa48cc994 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu May 9 11:32:39 2019 +0200 Bug 30448: Strip Browser/gtk2/libmozgtk.so --- projects/firefox/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index c15aac2..aefdb97 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -274,7 +274,7 @@ cd $distdir [% IF c("var/linux") %] # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) - for LIB in Browser/*.so Browser/firefox.real Browser/plugin-container Browser/updater + for LIB in Browser/*.so Browser/gtk2/*.so Browser/firefox.real Browser/plugin-container Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-launcher/master] Merge remote-tracking branch 'pc/bug29627-02'
by gk＠torproject.org 08 May '19

08 May '19

commit 0ce8339e490bb99096ff69cac17d648af028c951 Merge: 56b51a8 99035eb Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 3 12:54:48 2019 +0000 Merge remote-tracking branch 'pc/bug29627-02' src/chrome/content/network-settings.js | 16 ++++-- src/modules/tl-bridgedb.jsm | 96 ++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 22 deletions(-)

1 0

[tor-launcher/master] Bug 29627: Moat: add support for obfsproxy's meek_lite
by gk＠torproject.org 08 May '19

08 May '19

commit 99035eb7b6069c60fe4f97291abbea5af4fee886 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Mar 1 10:09:16 2019 -0500 Bug 29627: Moat: add support for obfsproxy's meek_lite Recognize "meek_lite" as a transport in addition to "meek". Use SOCKS args instead of command line parameters to pass the "url" (BridgeDB reflector) and "front" (BridgeDB front end) parameters to the PT binary. --- src/chrome/content/network-settings.js | 18 ++++--- src/modules/tl-bridgedb.jsm | 96 ++++++++++++++++++++++++++++------ 2 files changed, 91 insertions(+), 23 deletions(-) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 1599c28..fad89e5 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2019, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -542,18 +542,22 @@ function onOpenBridgeDBRequestPrompt() return; let meekClientPath; + let meekTransport; // We support both "meek" and "meek_lite". let meekClientArgs; reply.lineArray.forEach(aLine => { let tokens = aLine.split(' '); - if ((tokens.length > 2) && (tokens[0] == "meek") && (tokens[1] == "exec")) + if ((tokens.length > 2) && + ((tokens[0] == "meek") || (tokens[0] == "meek_lite")) && + (tokens[1] == "exec")) { + meekTransport = tokens[0]; meekClientPath = tokens[2]; meekClientArgs = tokens.slice(3); } }); - if (!meekClientPath) + if (!meekTransport) { reportMoatError(TorLauncherUtil.getLocalizedString("no_meek")); return; @@ -578,7 +582,8 @@ function onOpenBridgeDBRequestPrompt() resetBridgeDBRequestPrompt(); setBridgeDBRequestState("fetchingCaptcha"); overlay.hidden = false; - requestMoatCaptcha(proxySettings, meekClientPath, meekClientArgs); + requestMoatCaptcha(proxySettings, meekTransport, meekClientPath, + meekClientArgs); } } @@ -2508,7 +2513,8 @@ function createColonStr(aStr1, aStr2) } -function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) +function requestMoatCaptcha(aProxySettings, aMeekTransport, + aMeekClientPath, aMeekClientArgs) { function cleanup(aMoatRequestor, aErr) { @@ -2543,7 +2549,7 @@ function requestMoatCaptcha(aProxySettings, aMeekClientPath, aMeekClientArgs) }; addBridgeDBRequestEventListener(kCaptchaCancelEventType, cancelListener); - moatRequestor.init(proxyURLFromSettings(aProxySettings), + moatRequestor.init(proxyURLFromSettings(aProxySettings), aMeekTransport, aMeekClientPath, aMeekClientArgs) .then(()=> { diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 8b7a1d6..bc9b300 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2018, The Tor Project, Inc. +// Copyright (c) 2019, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -61,7 +61,6 @@ function _MoatRequestor() _MoatRequestor.prototype = { kMaxResponseLength: 1024 * 400, - kTransport: "meek", kMoatContentType: "application/vnd.api+json", kMoatVersion: "0.1.0", kPrefBridgeDBFront: "extensions.torlauncher.bridgedb_front", @@ -74,6 +73,9 @@ _MoatRequestor.prototype = kMoatCheckRequestType: "moat-solution", kMoatCheckResponseType: "moat-bridges", + kMozProxyTypeSocks4: "socks4", + kMozProxyTypeSocks5: "socks", + kStateIdle: 0, kStateWaitingForVersion: 1, kStateWaitingForProxyDone: 2, @@ -83,19 +85,22 @@ _MoatRequestor.prototype = mState: this.kStateIdle, + mMeekTransport: undefined, mLocalProxyURL: undefined, mMeekFront: undefined, // Frontend server, if we are using one. + mMeekClientEscapedArgs: undefined, mMeekClientProcess: undefined, mMeekClientStdoutBuffer: undefined, - mMeekClientProxyType: undefined, // contains Mozilla names such as socks4 + mMeekClientProxyType: undefined, // kMozProxyTypeSocks4 or kMozProxyTypeSocks5 mMeekClientIP: undefined, mMeekClientPort: undefined, mMoatResponseListener: undefined, mUserCanceled: false, // Returns a promise. - init: function(aProxyURL, aMeekClientPath, aMeekClientArgs) + init: function(aProxyURL, aMeekTransport, aMeekClientPath, aMeekClientArgs) { + this.mMeekTransport = aMeekTransport; this.mLocalProxyURL = aProxyURL; return this._startMeekClient(aMeekClientPath, aMeekClientArgs); }, @@ -208,21 +213,24 @@ _MoatRequestor.prototype = meekClientPath = f.path; } - // Construct the args array. - let args = aMeekClientArgs.slice(); // make a copy + // Construct the per-connection arguments. + this.mMeekClientEscapedArgs = ""; let meekReflector = TorLauncherUtil.getCharPref(this.kPrefBridgeDBReflector); if (meekReflector) { - args.push("-url"); - args.push(meekReflector); + this.mMeekClientEscapedArgs += "url="; + this.mMeekClientEscapedArgs += this._escapeArgValue(meekReflector); } this.mMeekFront = TorLauncherUtil.getCharPref(this.kPrefBridgeDBFront); if (this.mMeekFront) { - args.push("-front"); - args.push(this.mMeekFront); + if (this.mMeekClientEscapedArgs.length > 0) + this.mMeekClientEscapedArgs += ';'; + this.mMeekClientEscapedArgs += "front="; + this.mMeekClientEscapedArgs += this._escapeArgValue(this.mMeekFront); } + // Setup environment and start the meek client process. let ptStateDir = TorLauncherUtil.getTorFile("tordatadir", false); let meekHelperProfileDir = TorLauncherUtil.getTorFile("pt-profiles-dir", true); @@ -238,17 +246,19 @@ _MoatRequestor.prototype = let envAdditions = { TOR_PT_MANAGED_TRANSPORT_VER: "1", TOR_PT_STATE_LOCATION: ptStateDir.path, TOR_PT_EXIT_ON_STDIN_CLOSE: "1", - TOR_PT_CLIENT_TRANSPORTS: this.kTransport, + TOR_PT_CLIENT_TRANSPORTS: this.mMeekTransport, TOR_BROWSER_MEEK_PROFILE: meekHelperProfileDir.path }; if (this.mLocalProxyURL) envAdditions.TOR_PT_PROXY = this.mLocalProxyURL; TorLauncherLogger.log(3, "starting " + meekClientPath + " in " + workDir.path); - TorLauncherLogger.log(3, "args " + JSON.stringify(args)); + TorLauncherLogger.log(3, "args " + JSON.stringify(aMeekClientArgs)); TorLauncherLogger.log(3, "env additions " + JSON.stringify(envAdditions)); + TorLauncherLogger.log(3, "per-connection args \"" + + this.mMeekClientEscapedArgs + "\""); let opts = { command: meekClientPath, - arguments: args, + arguments: aMeekClientArgs, workdir: workDir.path, environmentAppend: true, environment: envAdditions, @@ -271,6 +281,21 @@ _MoatRequestor.prototype = }); }, // _startMeekClient + // Escape aValue per section 3.5 of the PT specification: + // First the "<Key>=<Value>" formatted arguments MUST be escaped, + // such that all backslash, equal sign, and semicolon characters + // are escaped with a backslash. + _escapeArgValue: function(aValue) + { + if (!aValue) + return ""; + + let rv = aValue.replace(/\\/g, "\\\\"); + rv = rv.replace(/=/g, "\\="); + rv = rv.replace(/;/g, "\\;"); + return rv; + }, + // Returns a promise that is resolved when the PT handshake finishes. _meekClientHandshake: function(aMeekClientProc) { @@ -389,7 +414,7 @@ _MoatRequestor.prototype = { errMsg = "Invalid CMETHOD response (too few parameters)."; } - else if (tokens[1] != this.kTransport) + else if (tokens[1] != this.mMeekTransport) { errMsg = "Unexpected transport " + tokens[1] + " in CMETHOD response."; @@ -399,11 +424,11 @@ _MoatRequestor.prototype = let proxyType = tokens[2]; if (proxyType == "socks5") { - this.mMeekClientProxyType = "socks"; + this.mMeekClientProxyType = this.kMozProxyTypeSocks5; } else if ((proxyType == "socks4a") || (proxyType == "socks4")) { - this.mMeekClientProxyType = "socks4"; + this.mMeekClientProxyType = this.kMozProxyTypeSocks4; } else { @@ -466,12 +491,49 @@ _MoatRequestor.prototype = // Based on meek/firefox/components/main.js _sendMoatRequest: function(aRequestObj, aIsCheck) { + // Include arguments per section 3.5 of the PT specification: + // Lastly the arguments are transmitted when making the outgoing + // connection using the authentication mechanism specific to the + // SOCKS protocol version. + // + // - In the case of SOCKS 4, the concatenated argument list is + // transmitted in the "USERID" field of the "CONNECT" request. + // + // - In the case of SOCKS 5, the parent process must negotiate + // "Username/Password" authentication [RFC1929], and transmit + // the arguments encoded in the "UNAME" and "PASSWD" fields. + // + // If the encoded argument list is less than 255 bytes in + // length, the "PLEN" field must be set to "1" and the "PASSWD" + // field must contain a single NUL character. + + let userName = ""; + let password = undefined; + if (this.mMeekClientProxyType == this.kMozProxyTypeSocks4) + { + userName = this.mMeekClientEscapedArgs; + } + else + { + if (this.mMeekClientEscapedArgs.length <= 255) + { + userName = this.mMeekClientEscapedArgs; + password = "\x00"; + } + else + { + userName = this.mMeekClientEscapedArgs.substring(0, 255); + password = this.mMeekClientEscapedArgs.substring(255); + } + } + let proxyPS = Cc["@mozilla.org/network/protocol-proxy-service;1"] .getService(Ci.nsIProtocolProxyService); let flags = Ci.nsIProxyInfo.TRANSPARENT_PROXY_RESOLVES_HOST; let noTimeout = 0xFFFFFFFF; // UINT32_MAX - let proxyInfo = proxyPS.newProxyInfo(this.mMeekClientProxyType, + let proxyInfo = proxyPS.newProxyInfoWithAuth(this.mMeekClientProxyType, this.mMeekClientIP, this.mMeekClientPort, + userName, password, flags, noTimeout, undefined); let uriStr = TorLauncherUtil.getCharPref(this.kPrefMoatService); if (!uriStr)

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed"
by gk＠torproject.org 08 May '19

08 May '19

commit 7f0035949b56c64a52b63d0289ad689cd66633ad Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 8 21:06:32 2019 +0000 Revert "Bug 30388: Disable nocertdb pref for armagadd-on 2.0 cert inclusion if needed" This reverts commit 1d2d420ff1c7231a60ec3ff497bd57815fc1d665. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 3aa0e41b625f..6cffc02d90ba 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1824,13 +1824,6 @@ function addMissingIntermediateCertificate() { } logger.debug("hotfix for addon signing cert has not been applied; applying"); - // temporarily disable nocertb so we can write cert - const PREF_NOCERTDB = "security.nocertdb"; - let userNocertdb = Services.prefs.getBoolPref(PREF_NOCERTDB, true); - if (userNocertdb) { - Services.prefs.setBoolPref(PREF_NOCERTDB, false); - } - try { let certDB = Cc["@mozilla.org/security/x509certdb;1"].getService(Ci.nsIX509CertDB); certDB.addCertFromBase64(MISSING_INTERMEDIATE_CERTIFICATE, ",,"); @@ -1838,11 +1831,6 @@ function addMissingIntermediateCertificate() { } catch (e) { logger.error("failed to add new intermediate certificate:", e); return; - } finally { - // revert nocertdb pref to original value (even if exception thrown) - if (userNocertdb) { - Services.prefs.setBoolPref(PREF_NOCERTDB, true); - } } Services.prefs.setBoolPref(PREF_SIGNER_HOTFIXED, true);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Pulling in new Torbutton release
by gk＠torproject.org 08 May '19

08 May '19

commit 6c18d3df29231e34f85c3ad974ea16c91c4e10f1 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 6 20:49:49 2019 +0000 Pulling in new Torbutton release --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 717715be0827..e702dfcb7731 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 717715be0827e3c4c9d4a6815f3c8027de3cee7e +Subproject commit e702dfcb7731c11787ab6f8c42cc8fe9b204cdc7

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 30136: Use 'Tor Browser' as brand name on mobile, too
by gk＠torproject.org 08 May '19

08 May '19

commit 3d5e5cc086f443c5ab5a0125a174d3e5f50181a2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 29 12:22:19 2019 +0000 Bug 30136: Use 'Tor Browser' as brand name on mobile, too --- mobile/android/branding/alpha/configure.sh | 2 +- mobile/android/branding/alpha/locales/en-US/brand.dtd | 2 +- mobile/android/branding/alpha/locales/en-US/brand.properties | 2 +- mobile/android/branding/nightly/configure.sh | 2 +- mobile/android/branding/nightly/locales/en-US/brand.dtd | 2 +- mobile/android/branding/nightly/locales/en-US/brand.properties | 2 +- mobile/android/branding/official/configure.sh | 2 +- mobile/android/branding/official/locales/en-US/brand.dtd | 2 +- mobile/android/branding/official/locales/en-US/brand.properties | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mobile/android/branding/alpha/configure.sh b/mobile/android/branding/alpha/configure.sh index 1fd6385c5a06..88e260f94a2e 100644 --- a/mobile/android/branding/alpha/configure.sh +++ b/mobile/android/branding/alpha/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Tor Browser for Android (Alpha)" +MOZ_APP_DISPLAYNAME="Tor Browser (Alpha)" ANDROID_PACKAGE_NAME=org.torproject.torbrowser_alpha MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd b/mobile/android/branding/alpha/locales/en-US/brand.dtd index 01346be36a7c..7200cc0f316b 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.dtd +++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "The Tor Project"> <!ENTITY brandPocket ""> diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties b/mobile/android/branding/alpha/locales/en-US/brand.properties index 12ebf8a5d205..db8634d73141 100644 --- a/mobile/android/branding/alpha/locales/en-US/brand.properties +++ b/mobile/android/branding/alpha/locales/en-US/brand.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=Tor Browser -brandFullName=Tor Browser for Android +brandFullName=Tor Browser diff --git a/mobile/android/branding/nightly/configure.sh b/mobile/android/branding/nightly/configure.sh index 47761caf31f4..15f53597468d 100644 --- a/mobile/android/branding/nightly/configure.sh +++ b/mobile/android/branding/nightly/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Tor Browser for Android (Nightly)" +MOZ_APP_DISPLAYNAME="Tor Browser (Nightly)" ANDROID_PACKAGE_NAME=org.torproject.torbrowser_nightly MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd b/mobile/android/branding/nightly/locales/en-US/brand.dtd index 01346be36a7c..7200cc0f316b 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.dtd +++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "The Tor Project"> <!ENTITY brandPocket ""> diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties b/mobile/android/branding/nightly/locales/en-US/brand.properties index 12ebf8a5d205..db8634d73141 100644 --- a/mobile/android/branding/nightly/locales/en-US/brand.properties +++ b/mobile/android/branding/nightly/locales/en-US/brand.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=Tor Browser -brandFullName=Tor Browser for Android +brandFullName=Tor Browser diff --git a/mobile/android/branding/official/configure.sh b/mobile/android/branding/official/configure.sh index aa8b56336ccc..4da3d246d3c5 100644 --- a/mobile/android/branding/official/configure.sh +++ b/mobile/android/branding/official/configure.sh @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME="Tor Browser for Android" +MOZ_APP_DISPLAYNAME="Tor Browser" ANDROID_PACKAGE_NAME=org.torproject.torbrowser MOZ_UPDATER= MOZ_ANDROID_ANR_REPORTER= diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd b/mobile/android/branding/official/locales/en-US/brand.dtd index 01346be36a7c..7200cc0f316b 100644 --- a/mobile/android/branding/official/locales/en-US/brand.dtd +++ b/mobile/android/branding/official/locales/en-US/brand.dtd @@ -3,7 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser for Android"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "The Tor Project"> <!ENTITY brandPocket ""> diff --git a/mobile/android/branding/official/locales/en-US/brand.properties b/mobile/android/branding/official/locales/en-US/brand.properties index 12ebf8a5d205..db8634d73141 100644 --- a/mobile/android/branding/official/locales/en-US/brand.properties +++ b/mobile/android/branding/official/locales/en-US/brand.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. brandShortName=Tor Browser -brandFullName=Tor Browser for Android +brandFullName=Tor Browser

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 30388: Set security.nocertdb to false for now
by gk＠torproject.org 08 May '19

08 May '19

commit c46b9fd16d0de6022e00d96d9959b2778908da7d Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 6 09:17:41 2019 +0000 Bug 30388: Set security.nocertdb to false for now --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c810c18a84a1..b6fcff155af8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -48,7 +48,7 @@ pref("browser.cache.offline.enable", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1); -pref("security.nocertdb", true); +pref("security.nocertdb", false); // Disk activity: TBB Directory Isolation pref("browser.download.useDownloadDir", false);

1 0