- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 9579237949269ef391e474f222011fa218608fae Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 25 17:25:29 2019 +0100 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 32498: Update MAR_CHANNEL_ID for nightly We also add the -alpha channel ID to the list of ACCEPTED_MAR_CHANNEL_IDS for the alpha, so that we can change the alpha channel name at some point. --- browser/confvars.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/browser/confvars.sh b/browser/confvars.sh index 428adaf6bcbc..adf45362014a 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -33,6 +33,15 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora MAR_CHANNEL_ID=firefox-mozilla-aurora +elif test "$MOZ_UPDATE_CHANNEL" = "alpha"; then + # alpha is currently using the -release channel id. However we accept + # both -alpha and -release channel ID for the alpha so that we can + # switch it to -alpha at some point. See bug 32498. + ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha,torbrowser-torproject-release + MAR_CHANNEL_ID=torbrowser-torproject-release +elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then + ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-nightly + MAR_CHANNEL_ID=torbrowser-torproject-nightly else ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-release MAR_CHANNEL_ID=torbrowser-torproject-release

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Bug 1598647 - Set Origin to null with network.http.referer.hideOnionSource r=JuniorHsu
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 1b5b65b5c8f11e3f2fd30ca0604fde741bc2c749 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Nov 25 13:29:47 2019 +0000 Bug 1598647 - Set Origin to null with network.http.referer.hideOnionSource r=JuniorHsu Differential Revision: https://phabricator.services.mozilla.com/D54303 --HG-- extra : moz-landing-system : lando --- dom/security/ReferrerInfo.cpp | 3 ++- dom/security/ReferrerInfo.h | 2 +- netwerk/protocol/http/nsCORSListenerProxy.cpp | 2 +- netwerk/protocol/http/nsHttpChannel.cpp | 17 +++++++---------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dom/security/ReferrerInfo.cpp b/dom/security/ReferrerInfo.cpp index 2d06d9b3d3d3..25d9cd3290c0 100644 --- a/dom/security/ReferrerInfo.cpp +++ b/dom/security/ReferrerInfo.cpp @@ -322,7 +322,8 @@ nsresult ReferrerInfo::HandleUserReferrerSendingPolicy(nsIHttpChannel* aChannel, return NS_OK; } -bool ReferrerInfo::IsCrossOriginRequest(nsIHttpChannel* aChannel) const { +/* static */ +bool ReferrerInfo::IsCrossOriginRequest(nsIHttpChannel* aChannel) { nsCOMPtr<nsILoadInfo> loadInfo = aChannel->LoadInfo(); nsCOMPtr<nsIURI> triggeringURI; diff --git a/dom/security/ReferrerInfo.h b/dom/security/ReferrerInfo.h index bf21233a0510..5fa052f3f32d 100644 --- a/dom/security/ReferrerInfo.h +++ b/dom/security/ReferrerInfo.h @@ -155,7 +155,7 @@ class ReferrerInfo : public nsIReferrerInfo { * Computing whether the request is cross-origin may be expensive, so please * do that in cases where we're going to use this information later on. */ - bool IsCrossOriginRequest(nsIHttpChannel* aChannel) const; + static bool IsCrossOriginRequest(nsIHttpChannel* aChannel); /* * Check whether referrer is allowed to send in secure to insecure scenario. diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index 36b263ddf003..36027a5d2809 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -985,7 +985,7 @@ nsresult nsCORSListenerProxy::UpdateChannel(nsIChannel* aChannel, if (!currentOrgin.EqualsIgnoreCase(origin.get()) && StringEndsWith(potentialOnionHost, NS_LITERAL_CSTRING(".onion"))) { - origin.Truncate(); + origin.AssignLiteral("null"); } } diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index b2d58379affe..7e1730c13b6a 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -9631,8 +9631,7 @@ void nsHttpChannel::SetOriginHeader() { nsContentUtils::GetASCIIOrigin(referrer, origin); } - // Restrict Origin to same-origin loads if requested by user or leaving from - // .onion + // Restrict Origin to same-origin loads if requested by user if (sSendOriginHeader == 1) { nsAutoCString currentOrigin; nsContentUtils::GetASCIIOrigin(mURI, currentOrigin); @@ -9640,16 +9639,14 @@ void nsHttpChannel::SetOriginHeader() { // Origin header suppressed by user setting return; } - } else if (dom::ReferrerInfo::HideOnionReferrerSource()) { + } + + if (dom::ReferrerInfo::HideOnionReferrerSource()) { nsAutoCString host; if (referrer && NS_SUCCEEDED(referrer->GetAsciiHost(host)) && - StringEndsWith(host, NS_LITERAL_CSTRING(".onion"))) { - nsAutoCString currentOrigin; - nsContentUtils::GetASCIIOrigin(mURI, currentOrigin); - if (!origin.EqualsIgnoreCase(currentOrigin.get())) { - // Origin header is suppressed by .onion - return; - } + StringEndsWith(host, NS_LITERAL_CSTRING(".onion")) && + dom::ReferrerInfo::IsCrossOriginRequest(this)) { + origin.AssignLiteral("null"); } }

1 0

[tor-browser/tor-browser-68.2.0esr-9.5-1] Revert "Bug 32255: Set Origin to null for CORS requests"
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 9de14da5e2a82b6e1ea4a4c68328996cbcc847ce Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Nov 26 13:31:20 2019 +0100 Revert "Bug 32255: Set Origin to null for CORS requests" This reverts commit f26fb9c17d71f3373c8ccb91ae74c438d9e13f80. --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 2 +- netwerk/protocol/http/nsHttpChannel.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index 36027a5d2809..36b263ddf003 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -985,7 +985,7 @@ nsresult nsCORSListenerProxy::UpdateChannel(nsIChannel* aChannel, if (!currentOrgin.EqualsIgnoreCase(origin.get()) && StringEndsWith(potentialOnionHost, NS_LITERAL_CSTRING(".onion"))) { - origin.AssignLiteral("null"); + origin.Truncate(); } } diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 362607d113ca..b2d58379affe 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -9647,8 +9647,8 @@ void nsHttpChannel::SetOriginHeader() { nsAutoCString currentOrigin; nsContentUtils::GetASCIIOrigin(mURI, currentOrigin); if (!origin.EqualsIgnoreCase(currentOrigin.get())) { - // Origin header set to null by .onion - origin.AssignLiteral("null"); + // Origin header is suppressed by .onion + return; } } }

1 0

[tor-browser-build/maint-9.0] Bug 30548: Clean up keyring file
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 6b722f712e666bdc4b80694a89b0950e42f3574a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 21 11:56:54 2019 +0000 Bug 30548: Clean up keyring file --- keyring/cmake.gpg | Bin 16939 -> 22706 bytes keyring/llvm.gpg | Bin 3335 -> 4309 bytes keyring/tor.gpg | Bin 159585 -> 9148 bytes keyring/torbrowser.gpg | Bin 125669 -> 2839 bytes keyring/torbutton.gpg | Bin 290913 -> 5120 bytes keyring/yawning.gpg | Bin 58959 -> 36705 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/cmake.gpg b/keyring/cmake.gpg index 51f19e7..05e12fc 100644 Binary files a/keyring/cmake.gpg and b/keyring/cmake.gpg differ diff --git a/keyring/llvm.gpg b/keyring/llvm.gpg index a94f435..7c7ab06 100644 Binary files a/keyring/llvm.gpg and b/keyring/llvm.gpg differ diff --git a/keyring/tor.gpg b/keyring/tor.gpg index 45b333f..3bca5c5 100644 Binary files a/keyring/tor.gpg and b/keyring/tor.gpg differ diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index 4f19dd0..ec64740 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 5a505f2..7100dcd 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ diff --git a/keyring/yawning.gpg b/keyring/yawning.gpg index e3384c5..067e96e 100644 Binary files a/keyring/yawning.gpg and b/keyring/yawning.gpg differ

1 0

[tor-browser-build/master] Fix Changelog errors
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 89c948c3ca5cfd06d9d03c270974b3027bc370dd Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 13:26:41 2019 +0000 Fix Changelog errors --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d010aa3..4dcf083 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,6 @@ Tor Browser 9.5a2 -- November 11 2019 * Bug 30783: Fundraising banner for EOY 2019 campain * Bug 32321: Don't ping Mozilla for Man-in-the-Middle-detection * Bug 32318: Backport Mozilla's fix for bug 1534339 - * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) * Bug 31573: Catch SessionStore.jsm exception * Bug 27268: Preferences clean-up * Windows + OS X + Linux @@ -14,6 +13,7 @@ Tor Browser 9.5a2 -- November 11 2019 * Update Tor Launcher to 0.2.20.2 * Bug 32164: Trim each received log line from tor * Translations update + * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) * Bug 31803: Replaced about:debugging logo with flat version * Bug 31764: Fix for error when navigating via 'Paste and go' * Bug 32169: Fix TB9 Wikipedia address bar search @@ -77,13 +77,13 @@ Tor Browser 9.5a1 -- October 23 2019 * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel * Translations update + * Windows + * Bug 32132: Re-enable jemalloc for Windows users + * Bug 31989: Backport backout of old mingw-gcc patch * Android * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr * Bug 26529: Notify user about possible proxy-bypass before opening external app * Build System - * Windows - * Bug 32132: Re-enable jemalloc for Windows users - * Bug 31989: Backport backout of old mingw-gcc patch * Android * Bug 30461: Clean up tor-android-service project

1 0

[tor-browser-build/master] Bump NoScript to 11.0.9
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 9515c45588dd5a72c44ddf4a0474ef09efa39c13 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 13:11:50 2019 +0000 Bump NoScript to 11.0.9 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 908a6a1..819ebad 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 0e3f0cfbf3563f0f6d6153d47833101b53e593ebcf6feee2e881d2516a4ce0c0 + sha256sum: 1522903c3486c790e842f9d5204cfbc93672676df4090f99c4d1ee3578ac8c07 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.2
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit e7bfed8ba6236194c6fc2723a7fae30af2cc62aa Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 13:21:54 2019 +0000 Release preparations for 9.0.2 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 4 ++-- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index c3bd1f2..16c0c34 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # 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-build2' +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 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.2.0 + firefox_platform_version: 68.3.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 6232669..1bc6f98 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.6.27 +version: 2019.11.7 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e19b00e..dd67e02 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser 9.0.2 -- December 3 2019 + * All Platforms + * Update Firefox to 68.3.0esr + * Bump NoScript to 11.0.9 + * Bug 32362: NoScript TRUSTED setting doesn't work + * Bug 32429: Issues with about:blank and NoScript on .onion sites + * Bump HTTPS Everywhere to 2019.11.7 + * Bug 27268: Preferences clean-up in Torbutton code + * Translations update + * Windows + OS X + Linux + * Bug 32125: Fix circuit display for bridge without a fingerprint + * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) + * Windows + * Bug 31989: Backport backout of old mingw-gcc patch + * Build System + * All Platforms + * Bug 32413: Bump Go version to 1.12.13 + Tor Browser 9.0.1 -- November 4 2019 * All Platforms * Update NoScript to 11.0.4

1 0

[tor-browser-build/maint-9.0] Bump NoScript to 11.0.9
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit d336d3e41aa1bf7cb8ae7c819a97151beb0b8e63 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 13:11:50 2019 +0000 Bump NoScript to 11.0.9 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 908a6a1..819ebad 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 0e3f0cfbf3563f0f6d6153d47833101b53e593ebcf6feee2e881d2516a4ce0c0 + sha256sum: 1522903c3486c790e842f9d5204cfbc93672676df4090f99c4d1ee3578ac8c07 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/maint-9.0] Pick up latest mobile translation changes
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 81ec019e843711f2b8c5b2c0d5d54cad264fd5c4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 20 13:23:58 2019 +0000 Pick up latest mobile translation changes --- projects/tba-translation/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 1b3274a..4056a6f 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 21677307d87d3216eede51a6ad36bf26e7937667 +git_hash: b31ac83a63ba8f0b63de07052c3e66ddff16c8aa version: '[% c("abbrev") %]'

1 0

[tor-browser/tor-browser-68.2.0esr-9.0-1] fixup! Pick up latest Torbutton code
by gk＠torproject.org 26 Nov '19

26 Nov '19

commit 2db7b75cce1a68cb9cdb95c4c871dd54e2d2543d Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 26 09:43:48 2019 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index e864f0fe4cfa..ae1a9af4a483 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit e864f0fe4cfabdc76bc8df312c8509071d4f3d75 +Subproject commit ae1a9af4a4830bde7034565615a853102e5fe1df

1 0