- tbb-commits - lists.torproject.org

[tor-browser-build/maint-11.0] Bug 40318: Remove check for DISPLAY env var in start-tor-browser
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit e22cd4e5deedb685f058f20f431b9dfc8c44fca9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 11 12:56:40 2021 +0100 Bug 40318: Remove check for DISPLAY env var in start-tor-browser When using Wayland, the DISPLAY environment variable does not need to be set, so the start-tor-browser script should not fail in that case. Wayland support is still disabled by default in Firefox, and users who want to enable it will need to set the MOZ_ENABLE_WAYLAND environment variable. --- projects/tor-browser/RelativeLink/start-tor-browser | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 624bb3c..cd70765 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -7,16 +7,7 @@ complain_dialog_title="Tor Browser" -# First, make sure DISPLAY is set. If it isn't, we're hosed; scream -# at stderr and die. -if [ "x$DISPLAY" = "x" ]; then - echo "$complain_dialog_title must be run within the X Window System." >&2 - echo "Exiting." >&2 - exit 1 -fi - -# Second, make sure this script wasn't started as 'sh start-tor-browser' or -# similar. +# Make sure this script wasn't started as 'sh start-tor-browser' or similar. if [ "x$BASH" = "x" ]; then echo "$complain_dialog_title should be started as './start-tor-browser'" echo "Exiting." >&2

1 0

[tor-browser-build/maint-11.0] Pick up a few more fixes for 11.0.2
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit 7d9eb93e0f6bd6eaf4346e56f3b260406091fd95 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 3 19:52:18 2021 +0000 Pick up a few more fixes for 11.0.2 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ rbm.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ad0ed52..6cf70db 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,8 @@ Tor Browser 11.0.1 - December 7 2021 * Windows + OS X + Linux * Update Firefox to 91.4.0esr + * Bug 40318: Remove check for DISPLAY env var in start-tor-browser [tor-browser-build] + * Bug 40386: Add new default obfs4 bridge "deusexmachina" [tor-browser-build] * Bug 40682: Disable network.proxy.allow_bypass [tor-browser] * Linux * Bug 40387: Remove some fonts on Linux [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 3a32f8b..b1c49f2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -58,7 +58,7 @@ buildconf: var: torbrowser_version: '11.0.2' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 11.0.1 project_name: tor-browser

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40318'
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit 3da16ab0db7ea2e6e6bed058910b679fc9373158 Merge: f80537e 63d5277 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 3 19:50:05 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40318' projects/tor-browser/RelativeLink/start-tor-browser | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)

1 0

[tor-browser-build/master] Bug 40318: Remove check for DISPLAY env var in start-tor-browser
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit 63d527733e6990c9424d5976a779a9574eef5c47 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 11 12:56:40 2021 +0100 Bug 40318: Remove check for DISPLAY env var in start-tor-browser When using Wayland, the DISPLAY environment variable does not need to be set, so the start-tor-browser script should not fail in that case. Wayland support is still disabled by default in Firefox, and users who want to enable it will need to set the MOZ_ENABLE_WAYLAND environment variable. --- projects/tor-browser/RelativeLink/start-tor-browser | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 624bb3c..cd70765 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -7,16 +7,7 @@ complain_dialog_title="Tor Browser" -# First, make sure DISPLAY is set. If it isn't, we're hosed; scream -# at stderr and die. -if [ "x$DISPLAY" = "x" ]; then - echo "$complain_dialog_title must be run within the X Window System." >&2 - echo "Exiting." >&2 - exit 1 -fi - -# Second, make sure this script wasn't started as 'sh start-tor-browser' or -# similar. +# Make sure this script wasn't started as 'sh start-tor-browser' or similar. if [ "x$BASH" = "x" ]; then echo "$complain_dialog_title should be started as './start-tor-browser'" echo "Exiting." >&2

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40386'
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit f80537ea43148f9b599da377c8bba24f179ebf0d Merge: 2a89fc9 2f83fc5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 3 19:49:37 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40386' projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 40386: Add new default obfs4 bridge "deusexmachina"
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit 2f83fc5fd5a4c0a4d531cedc8d4d7a068b1937ec Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 30 20:18:39 2021 +0100 Bug 40386: Add new default obfs4 bridge "deusexmachina" --- projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 22e9984..2fbe392 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -17,6 +17,7 @@ pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 146.57.248.225:22 pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 185.100.85.3:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/maint-11.0] fixup! Release preparations for 11.0.2
by sysrqb＠torproject.org 03 Dec '21

03 Dec '21

commit d47288bb5cc9cec59bcf6108c7957373a3bce763 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Dec 3 02:02:22 2021 +0000 fixup! Release preparations for 11.0.2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 36f39fb..98325be 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 208413e..3a32f8b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -58,7 +58,7 @@ buildconf: var: torbrowser_version: '11.0.2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 11.0.1 project_name: tor-browser

1 0

[tor-browser-build/maint-11.0] Bug 40387: Remove some fonts on Linux
by sysrqb＠torproject.org 02 Dec '21

02 Dec '21

commit 800ba228e634b769687c31dfb51dff9866a048d9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 30 20:45:22 2021 +0100 Bug 40387: Remove some fonts on Linux Remove NotoSansGurmukhi-Regular.ttf and NotoSansSinhala-Regular.ttf which are causing issues on some systems. --- projects/fonts/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/fonts/config b/projects/fonts/config index 9d11d2c..4e3719d 100644 --- a/projects/fonts/config +++ b/projects/fonts/config @@ -23,7 +23,6 @@ var: - NotoSansEthiopic-Regular.ttf - NotoSansGeorgian-Regular.ttf - NotoSansGujarati-Regular.ttf - - NotoSansGurmukhi-Regular.ttf - NotoSansHebrew-Regular.ttf - NotoSansKannada-Regular.ttf - NotoSansKhmer-Regular.ttf @@ -31,7 +30,6 @@ var: - NotoSansMalayalam-Regular.ttf - NotoSansMyanmar-Regular.ttf - NotoSansOriya-Regular.ttf - - NotoSansSinhala-Regular.ttf - NotoSansTamil-Regular.ttf - NotoSansTelugu-Regular.ttf - NotoSansThaana-Regular.ttf

1 0

[tor-browser-build/maint-11.0] Release preparations for 11.0.2
by sysrqb＠torproject.org 02 Dec '21

02 Dec '21

commit 80a73f38e6a3720ed83518e86a74d68690b277f8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Dec 2 14:19:29 2021 +0000 Release preparations for 11.0.2 Version and Changelog updates --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 249c2c7..36f39fb 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 91.3.0 + firefox_platform_version: 91.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 11.0 branding_directory: 'browser/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a542294..ad0ed52 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 11.0.1 - December 7 2021 + * Windows + OS X + Linux + * Update Firefox to 91.4.0esr + * Bug 40682: Disable network.proxy.allow_bypass [tor-browser] + * Linux + * Bug 40387: Remove some fonts on Linux [tor-browser-build] + Tor Browser 11.0.1 - November 14 2021 * Windows + OS X + Linux * Tor Launcher 0.2.32 diff --git a/rbm.conf b/rbm.conf index 2ba2ac0..208413e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,11 +57,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.0.1' + torbrowser_version: '11.0.2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.5.10 - - 11.0 + - 11.0.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 40387: Remove some fonts on Linux
by sysrqb＠torproject.org 02 Dec '21

02 Dec '21

commit 2a89fc9e333646eaea46823cf6fc9533e89f61bf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Nov 30 20:45:22 2021 +0100 Bug 40387: Remove some fonts on Linux Remove NotoSansGurmukhi-Regular.ttf and NotoSansSinhala-Regular.ttf which are causing issues on some systems. --- projects/fonts/config | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/fonts/config b/projects/fonts/config index 9d11d2c..4e3719d 100644 --- a/projects/fonts/config +++ b/projects/fonts/config @@ -23,7 +23,6 @@ var: - NotoSansEthiopic-Regular.ttf - NotoSansGeorgian-Regular.ttf - NotoSansGujarati-Regular.ttf - - NotoSansGurmukhi-Regular.ttf - NotoSansHebrew-Regular.ttf - NotoSansKannada-Regular.ttf - NotoSansKhmer-Regular.ttf @@ -31,7 +30,6 @@ var: - NotoSansMalayalam-Regular.ttf - NotoSansMyanmar-Regular.ttf - NotoSansOriya-Regular.ttf - - NotoSansSinhala-Regular.ttf - NotoSansTamil-Regular.ttf - NotoSansTelugu-Regular.ttf - NotoSansThaana-Regular.ttf

1 0