- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-68.4.1esr-9.0-1] Bug 1598647 - Set Origin to null with network.http.referer.hideOnionSource r=JuniorHsu
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 5526a109e6266ce31f8014912d5b91b154736ef6 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 d9c750dff4b0..b2c0956d0b66 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -9634,8 +9634,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); @@ -9643,16 +9642,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.4.1esr-9.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit bfe5efa2e8eaac36bc9930fa1437b1a70045532b Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Feb 5 12:29:58 2020 +0100 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing --- .../search/extensions/disconnect/favicon.ico | Bin 1150 -> 0 bytes .../search/extensions/disconnect/manifest.json | 25 -------- browser/components/search/extensions/list.json | 68 ++++++++++----------- 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/browser/components/search/extensions/disconnect/favicon.ico b/browser/components/search/extensions/disconnect/favicon.ico deleted file mode 100644 index bffe0e17e698..000000000000 Binary files a/browser/components/search/extensions/disconnect/favicon.ico and /dev/null differ diff --git a/browser/components/search/extensions/disconnect/manifest.json b/browser/components/search/extensions/disconnect/manifest.json deleted file mode 100644 index 7f768579554f..000000000000 --- a/browser/components/search/extensions/disconnect/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "Disconnect", - "description": "Private searches using disconnect.me", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "disconnect(a)search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": [ - "favicon.ico" - ], - "chrome_settings_overrides": { - "search_provider": { - "name": "Disconnect", - "search_url": "https://search.disconnect.me/searchTerms/search?ses=Google&location_option=…", - "search_url_post_params": "query={searchTerms}" - } - } -} \ No newline at end of file diff --git a/browser/components/search/extensions/list.json b/browser/components/search/extensions/list.json index 15504eacb70c..84428869d627 100644 --- a/browser/components/search/extensions/list.json +++ b/browser/components/search/extensions/list.json @@ -3,7 +3,7 @@ "searchDefault": "DuckDuckGo", "searchOrder": ["DuckDuckGo", "YouTube", "Google"], "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "regionOverrides": { @@ -12,7 +12,7 @@ "en-US": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "experimental-hidden": { @@ -45,7 +45,7 @@ "ar": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -134,7 +134,7 @@ "ca": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -155,7 +155,7 @@ "cs": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -169,14 +169,14 @@ "da": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "de": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -190,7 +190,7 @@ "el": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -307,7 +307,7 @@ "es-AR": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -321,7 +321,7 @@ "es-ES": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -354,7 +354,7 @@ "fa": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -375,7 +375,7 @@ "fr": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -394,7 +394,7 @@ "ga-IE": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -429,7 +429,7 @@ "he": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -457,7 +457,7 @@ "hu": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -478,42 +478,42 @@ "id": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "is": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "it": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ja-JP-macos": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ja": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ka": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -560,7 +560,7 @@ "ko": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -609,7 +609,7 @@ "mk": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -644,7 +644,7 @@ "nb-NO": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -658,7 +658,7 @@ "nl": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "experimental-hidden": { @@ -698,14 +698,14 @@ "pl": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "pt-BR": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -726,14 +726,14 @@ "ro": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, "ru": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "RU": { @@ -794,7 +794,7 @@ "sv-SE": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -829,7 +829,7 @@ "tr": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "TR": { @@ -876,7 +876,7 @@ "vi": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }, @@ -897,7 +897,7 @@ "zh-CN": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] }, "CN": { @@ -907,7 +907,7 @@ "zh-TW": { "default": { "visibleDefaultEngines": [ - "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "disconnect", "youtube", "startpage" + "ddg", "ddg-onion", "google", "yahoo", "twitter", "wikipedia", "youtube", "startpage" ] } }

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit 3b2bbab2571b2179c5d4ca272fce120cc732a62e Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Feb 6 03:53:58 2020 +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 f4d81a9f8130..f87cd0af7462 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f4d81a9f8130dd3350eae0bf967ef857308ea4d0 +Subproject commit f87cd0af7462faab1d349e28e7b17c76274624b0

1 0

[torbutton/master] Bug 31395: Remove inline script in aboutTor.xhtml
by sysrqb＠torproject.org 05 Feb '20

05 Feb '20

commit f87cd0af7462faab1d349e28e7b17c76274624b0 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Jan 14 13:14:06 2020 +0100 Bug 31395: Remove inline script in aboutTor.xhtml --- chrome.manifest | 1 + chrome/content/aboutTor/aboutTor.xhtml | 11 ++--------- chrome/content/aboutTor/resources/aboutTor.js | 11 +++++++++++ jar.mn | 1 + 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index d1ffe6d6..6d9d12d4 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,5 +1,6 @@ content torbutton chrome/content/ resource torbutton ./ +resource torbutton-abouttor resource://torbutton/content/aboutTor/resources/ contentaccessible=yes resource torbutton-assets resource://torbutton/chrome/skin/ contentaccessible=yes # browser branding diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 56777ba3..db313c3d 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -20,19 +20,12 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <meta http-equiv="Content-Security-Policy" content="default-src chrome: resource:; script-src chrome: resource: 'unsafe-inline';" /> + <meta http-equiv="Content-Security-Policy" content="default-src resource:;" /> <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton-assets/aboutTor.css"/> -<script type="text/javascript"> - <![CDATA[ -window.addEventListener("pageshow", function() { - let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); - document.dispatchEvent(evt); -}); -]]> -</script> + <script type="text/javascript" src="resource://torbutton-abouttor/aboutTor.js"></script> </head> <body dir="&locale.dir;"> <div class="torcontent-container"> diff --git a/chrome/content/aboutTor/resources/aboutTor.js b/chrome/content/aboutTor/resources/aboutTor.js new file mode 100644 index 00000000..6687390b --- /dev/null +++ b/chrome/content/aboutTor/resources/aboutTor.js @@ -0,0 +1,11 @@ +/************************************************************************* + * Copyright (c) 2020, The Tor Project, Inc. + * See LICENSE for licensing information. + * + * vim: set sw=2 sts=2 ts=8 et syntax=javascript: + *************************************************************************/ + +window.addEventListener("pageshow", function() { + let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); + document.dispatchEvent(evt); +}); diff --git a/jar.mn b/jar.mn index 45c8c9b8..3838bc9b 100644 --- a/jar.mn +++ b/jar.mn @@ -10,6 +10,7 @@ torbutton.jar: skin/ (chrome/skin/*) % resource torbutton % +% resource torbutton-abouttor resource://torbutton/content/aboutTor/resources/ contentaccessible=yes % resource torbutton-assets resource://torbutton/skin/ contentaccessible=yes # browser branding

1 0

[tor-browser-build/master] Bump tor alpha version
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit 9f9deebd2327555c6afbfa9e0a83a2b6f94ff9a3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 5 00:09:20 2020 +0000 Bump tor alpha version --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index 4a1045c..c1c41a6 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.2.5 +version: 0.4.3.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 32768: Create a build-infos.json file
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit 50b8b9db82bbf84713b3af0bbe27d06a729642ab Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 16 18:57:22 2019 +0100 Bug 32768: Create a build-infos.json file Create a file containing firefox platformVersion and buildID. --- projects/firefox/build | 9 +++++++++ projects/tor-browser/build | 3 +++ rbm.conf | 1 + 3 files changed, 13 insertions(+) diff --git a/projects/firefox/build b/projects/firefox/build index 22c5b5d..c334854 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -273,3 +273,12 @@ END; zip_src => [ 'mar-tools' ], zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'), }) %] + +[% IF c("var/build_infos_json") -%] + cat > "[% dest_dir _ '/' _ c('filename') _ '/build-infos.json' %]" << EOF_BUILDINFOS + { + "firefox_platform_version" : "[% c("var/firefox_platform_version") %]", + "firefox_buildid" : "$MOZ_BUILD_DATE" + } +EOF_BUILDINFOS +[% END -%] diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4d44f12..2633ddc 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -297,6 +297,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz [% END -%] +[% IF c("var/build_infos_json") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json +[% END -%] # Create a tarball with all Linux x86_64 language packs (Bug 32676) [% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] diff --git a/rbm.conf b/rbm.conf index f0e22a8..77c6e4a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -158,6 +158,7 @@ targets: - fr - ru max_torbrowser_incremental_from: 2 + build_infos_json: 1 torbrowser-testbuild: - testbuild

1 0

[tor-browser-build/master] Bug 32891: Pick up new default bridge
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit 0d50bcb46dc0ec08c7076d26da3eb561ba10d6b1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 5 00:30:06 2020 +0000 Bug 32891: Pick up new default bridge --- 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 d7a5882..ca68d7b 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: 4a81e5806f36e7d0bf9492437d824599ecf4ff43 +git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Move OpenPGP keys under Build System in Changelog
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit fbad74f0a5f743a031683420426983ab99a97835 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Feb 4 20:40:00 2020 +0000 Move OpenPGP keys under Build System in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a123447..ad3cc9d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,6 @@ Tor Browser 9.5a4 -- January 10 2020 * Update Firefox to 68.4.1esr * Bump NoScript to 11.0.11 * Translations update - * Update OpenPGP keyring * Bug 31134: Govern graphite again by security settings * Bug 31855: Remove End of Year Fundraising Campaign from about:tor * Bug 32053: Fix LLVM reproducibility issues @@ -17,6 +16,7 @@ Tor Browser 9.5a4 -- January 10 2020 * Bug 32674: Point the about:tor "Get involved" link to the community portal * Build System * All Platforms + * Update OpenPGP keyring * Bug 32739: Bump clang to 8.0.1 * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs @@ -30,7 +30,6 @@ Tor Browser 9.0.3 -- January 7 2020 * Update Firefox to 68.4.0esr * Bump NoScript to 11.0.11 * Translations update - * Update OpenPGP keyring * Bug 32606: Set up default bridge at Georgetown University * Bug 32659: Remove IPv6 address of default bridge * Bug 32547: Add new default bridge at UMN @@ -42,6 +41,8 @@ Tor Browser 9.0.3 -- January 7 2020 * Android * Bug 32405: Crash immediately after bootstrap on Android * Build System + * All Platforms + * Update OpenPGP keyring * Linux * Bug 32676: Create a tarball with all Linux x86_64 language packs

1 0

[tor-android-service/master] Merge remote-tracking branch 'phwgh/task/32891'
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit 18ba7d2780b1d5194cc5854d703655f6c9d3d196 Merge: 4a81e58 694ef51 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Feb 5 00:28:58 2020 +0000 Merge remote-tracking branch 'phwgh/task/32891' service/src/main/assets/common/bridges.txt | 2 ++ 1 file changed, 2 insertions(+) diff --cc service/src/main/assets/common/bridges.txt index adc6b8c,5e3227d..7c1ebcf --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@@ -10,5 -10,6 +10,7 @@@ obfs4 193.11.166.194:27015 2D82C2E354D5 obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0 +obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0 + obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 + obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[tor-android-service/master] Bug 32891: Add new IPv4/IPv6 default bridge.
by sysrqb＠torproject.org 04 Feb '20

04 Feb '20

commit 694ef51f3a59c39c74bd22d1a1ee48f4b91d235f Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Jan 8 15:54:38 2020 +0100 Bug 32891: Add new IPv4/IPv6 default bridge. Toke Høiland-Jørgensen generously offered to set up a default bridge in Denmark. This fixes <https://bugs.torproject.org/32891>. --- service/src/main/assets/common/bridges.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt index 36ed076..5e3227d 100644 --- a/service/src/main/assets/common/bridges.txt +++ b/service/src/main/assets/common/bridges.txt @@ -10,4 +10,6 @@ obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJr obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0 obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0 obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0 +obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 +obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0 meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0