- tbb-commits - lists.torproject.org

[tor-browser-build/master] Fold in 9.5.2 Changelog
by sysrqb＠torproject.org 23 Jul '20

23 Jul '20

commit dcddad0e162442c8629f00c351f37ab5b9fe4aa7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jul 22 17:29:36 2020 +0000 Fold in 9.5.2 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a6b6408..719a603 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,10 @@ Tor Browser 10.0a3 -- July 7 2020 * Android * Update Firefox to 68.10.1esr +Tor Browser 9.5.2 -- July 7 2020 + * Android + * Update Firefox to 68.10.1esr + Tor Browser 10.0a2 -- June 30 2020 * All Platforms * Update Firefox to 68.10.0esr

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/10' into tor-browser-78.0.1esr-10.0-1
by gk＠torproject.org 22 Jul '20

22 Jul '20

commit d9fe98562c0b83dcf6c1168cf6a343e398e9630e Merge: 909d50c7f074 996a89709e6e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 22 09:39:42 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/10' into tor-browser-78.0.1esr-10.0-1 browser/components/securitylevel/content/securityLevel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 22 Jul '20

22 Jul '20

commit 996a89709e6e649ec957ee21a0c3b4b842c0b62f Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Jul 21 15:10:33 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- browser/components/securitylevel/content/securityLevel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index e595e4a4e5b2..b47d0cfb545e 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -358,7 +358,7 @@ const SecurityLevelPreferences = labelSummary.textContent = stringStruct.summary; let labelRestoreDefaults = vbox.querySelector("#securityLevel-restoreDefaults"); - labelRestoreDefaults.setAttribute("value", SecurityLevelStrings.restoreDefaults); + labelRestoreDefaults.setAttribute("value", TorStrings.securityLevel.restoreDefaults); labelRestoreDefaults.addEventListener("click", SecurityLevelPreferences.restoreDefaults); let description1 = vbox.querySelector("#securityLevel-description1");

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 13379: Sign our MAR files.
by gk＠torproject.org 22 Jul '20

22 Jul '20

commit 909d50c7f074ea82534839c016db8e59a12ec9b8 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 21 11:29:42 2020 -0400 fixup! Bug 13379: Sign our MAR files. --- modules/libmar/tool/mar.c | 9 --------- modules/libmar/tool/moz.build | 7 ------- 2 files changed, 16 deletions(-) diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c index 4252808b9b8f..ea2b79924914 100644 --- a/modules/libmar/tool/mar.c +++ b/modules/libmar/tool/mar.c @@ -30,11 +30,7 @@ int mar_repackage_and_sign(const char* NSSConfigDir, const char* src, const char* dest); static void print_version() { -#ifdef TOR_BROWSER_UPDATE - printf("Version: %s\n", TOR_BROWSER_VERSION_QUOTED); -#else printf("Version: %s\n", MOZ_APP_VERSION); -#endif printf("Default Channel ID: %s\n", MAR_CHANNEL_ID); } @@ -129,13 +125,8 @@ static int mar_test(const char* path) { int main(int argc, char** argv) { const char* certNames[MAX_SIGNATURES]; -#ifdef TOR_BROWSER_UPDATE - char* MARChannelID = MAR_CHANNEL_ID; - char* productVersion = TOR_BROWSER_VERSION_QUOTED; -#else char* MARChannelID = NULL; char* productVersion = NULL; -#endif int rv = -1; #if !defined(NO_SIGN_VERIFY) char* NSSConfigDir = NULL; diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index b0f87e8068ce..8953af0bb15c 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -61,10 +61,3 @@ for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'): HOST_DEFINES[var] = '"%s"' % CONFIG[var] if SOURCES: DEFINES[var] = HOST_DEFINES[var] - -if CONFIG['TOR_BROWSER_UPDATE']: - DEFINES['TOR_BROWSER_UPDATE'] = '%s' % CONFIG['TOR_BROWSER_UPDATE'] -if CONFIG['TOR_BROWSER_VERSION_QUOTED']: - DEFINES['TOR_BROWSER_VERSION_QUOTED'] = '%s' % CONFIG['TOR_BROWSER_VERSION_QUOTED'] - -

1 0

[tor-browser-build/maint-9.5] Release preparations for 9.5.3
by sysrqb＠torproject.org 22 Jul '20

22 Jul '20

commit 8aa469dc35d9003ca38006f15c809581f698abfa Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jul 21 16:39:51 2020 +0000 Release preparations for 9.5.3 Changelog update and versions bump --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ projects/tor-browser/config | 4 ++-- projects/tor/build | 3 --- projects/tor/config | 3 +-- rbm.conf | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 414097f..022eea9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.10.1 + firefox_platform_version: 68.11.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bd49a23..0e14dae 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 9.5.3 -- July 28 2020 + * All Platforms + * Update Firefox to 68.11.0esr + * Update NoScript to 11.0.34 + * Update Tor to 0.4.3.6 + Tor Browser 9.5.2 -- July 7 2020 * Android * Update Firefox to 68.10.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6bd09de..9254cf6 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: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d + sha256sum: 759a38df3ef121804bf8933ab5289ec8452d5663fcad2f484b73095d8b488578 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/build b/projects/tor/build index 012ec98..6dd22f7 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -92,9 +92,6 @@ openssldir=/var/tmp/dist/openssl/openssl cd /var/tmp/build/[% project %]-[% c('version') %] -# Cherry-pick patch until 0.4.3.6 is released. -patch -p1 < $rootdir/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch - # add git hash to micro-revision.i for #24995 echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh diff --git a/projects/tor/config b/projects/tor/config index 1f57465..999f387 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.3.5 +version: 0.4.3.6 git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 @@ -68,4 +68,3 @@ input_files: - name: zstd project: zstd enable: '[% c("var/android") %]' - - filename: 0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch diff --git a/rbm.conf b/rbm.conf index 05ffcf2..111ea70 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5.2' + torbrowser_version: '9.5.3' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5 + - 9.5.1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 40026: Fix full .mar creation for esr78
by gk＠torproject.org 22 Jul '20

22 Jul '20

commit 9bbec35a53f80d2408bf680de67cee505a317a1a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jul 21 06:18:44 2020 +0000 Bug 40026: Fix full .mar creation for esr78 At the same time we remove the MBSDIFF environment variable as it is not needed for full .mar file generation. --- projects/tor-browser/build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 386ea26..155a7bc 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -262,7 +262,10 @@ cd $distdir [% IF c("var/build_mar") -%] # Create full MAR file and compressed package. [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" + MAR=$MARTOOLS/mar \ + MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \ + MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \ + $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] [% IF c("var/linux") %] @@ -377,7 +380,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF build_mar -%] # Create full MAR file and compressed package for this locale. - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" + MAR=$MARTOOLS/mar \ + MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \ + MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \ + $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" [% END -%] [% IF c("var/linux") %]

1 0

[tor-browser-build/master] Bug 40025: Only build desktop nightly (for now)
by sysrqb＠torproject.org 18 Jul '20

18 Jul '20

commit 136823783c234f8c3d82f2ed4dca15aad94d08cb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jul 17 16:49:27 2020 +0000 Bug 40025: Only build desktop nightly (for now) --- Makefile | 2 +- projects/release/config | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cb7edc5..4947441 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ alpha-src: submodule-update $(rbm) build release --target alpha --target torbrowser-src nightly: submodule-update - $(rbm) build release --target nightly --target torbrowser-all + $(rbm) build release --target nightly --target torbrowser-all-desktop nightly-android: submodule-update $(rbm) build release --target nightly --target torbrowser-all-android diff --git a/projects/release/config b/projects/release/config index c6e883b..8505971 100644 --- a/projects/release/config +++ b/projects/release/config @@ -19,6 +19,13 @@ targets: - torbrowser-android-x86_64 - torbrowser-android-aarch64 - torbrowser-src + torbrowser-all-desktop: + - torbrowser-linux-x86_64 + - torbrowser-linux-i686 + - torbrowser-windows-i686 + - torbrowser-windows-x86_64 + - torbrowser-osx-x86_64 + - torbrowser-src torbrowser-all-android: - torbrowser-android-armv7 - torbrowser-android-x86 @@ -67,6 +74,7 @@ targets: - release - torbrowser-all - torbrowser-all-android + - torbrowser-all-desktop noversiondir: var:

1 0

[tor-browser/tor-browser-68.10.1esr-10.0-1] fixup! Bug 21952: Implement Onion-Location
by sysrqb＠torproject.org 18 Jul '20

18 Jul '20

commit cb1d031006d91fce3b537f17b5680d9ecea76626 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 2 21:38:54 2020 +0200 fixup! Bug 21952: Implement Onion-Location --- dom/base/Document.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index 994f52659265..1a565a48f6dd 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3735,16 +3735,17 @@ void Document::GetHeaderData(nsAtom* aHeaderField, nsAString& aData) const { static bool IsValidOnionLocation(nsIURI* aDocumentURI, nsIURI* aOnionLocationURI) { bool isHttpish; - nsAutoCString onionHost; + nsAutoCString host; return aDocumentURI && aOnionLocationURI && NS_SUCCEEDED(aDocumentURI->SchemeIs("https", &isHttpish)) && - isHttpish && + isHttpish && NS_SUCCEEDED(aDocumentURI->GetAsciiHost(host)) && + !StringEndsWith(host, NS_LITERAL_CSTRING(".onion")) && ((NS_SUCCEEDED(aOnionLocationURI->SchemeIs("http", &isHttpish)) && isHttpish) || (NS_SUCCEEDED(aOnionLocationURI->SchemeIs("https", &isHttpish)) && isHttpish)) && - NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(onionHost)) && - StringEndsWith(onionHost, NS_LITERAL_CSTRING(".onion")); + NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(host)) && + StringEndsWith(host, NS_LITERAL_CSTRING(".onion")); } void Document::SetHeaderData(nsAtom* aHeaderField, const nsAString& aData) {

1 0

[tor-browser/tor-browser-68.10.0esr-10.0-1] fixup! Bug 21952: Implement Onion-Location
by sysrqb＠torproject.org 18 Jul '20

18 Jul '20

commit 15a6dc8a482e29f773471ddac102e18120e6043e Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 2 21:38:54 2020 +0200 fixup! Bug 21952: Implement Onion-Location --- dom/base/Document.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index 994f52659265..1a565a48f6dd 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3735,16 +3735,17 @@ void Document::GetHeaderData(nsAtom* aHeaderField, nsAString& aData) const { static bool IsValidOnionLocation(nsIURI* aDocumentURI, nsIURI* aOnionLocationURI) { bool isHttpish; - nsAutoCString onionHost; + nsAutoCString host; return aDocumentURI && aOnionLocationURI && NS_SUCCEEDED(aDocumentURI->SchemeIs("https", &isHttpish)) && - isHttpish && + isHttpish && NS_SUCCEEDED(aDocumentURI->GetAsciiHost(host)) && + !StringEndsWith(host, NS_LITERAL_CSTRING(".onion")) && ((NS_SUCCEEDED(aOnionLocationURI->SchemeIs("http", &isHttpish)) && isHttpish) || (NS_SUCCEEDED(aOnionLocationURI->SchemeIs("https", &isHttpish)) && isHttpish)) && - NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(onionHost)) && - StringEndsWith(onionHost, NS_LITERAL_CSTRING(".onion")); + NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(host)) && + StringEndsWith(host, NS_LITERAL_CSTRING(".onion")); } void Document::SetHeaderData(nsAtom* aHeaderField, const nsAString& aData) {

1 0

[tor-browser/tor-browser-68.10.0esr-10.0-1] Merge remote-tracking branch 'acatgl/40019' into tor-browser-68.10.0esr-10.0-1
by sysrqb＠torproject.org 18 Jul '20

18 Jul '20

commit 47e12953af4b68b23e62dab5c3520695ee619102 Merge: 0eb998725499 15a6dc8a482e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jul 17 15:18:50 2020 +0000 Merge remote-tracking branch 'acatgl/40019' into tor-browser-68.10.0esr-10.0-1 dom/base/Document.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

1 0