- tbb-commits - lists.torproject.org

[tor-browser-build/master] Release preparations for 7.5a8
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c66cabcdd8b364780be5ad6f80d31d7a414e8aac Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 11:18:02 2017 +0000 Release preparations for 7.5a8 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/sandbox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 3 ++- 9 files changed, 32 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 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 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 24bb711..5b64726 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.4.1 + firefox_platform_version: 52.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/sandbox/config b/projects/sandbox/config index 0a79ac9..03b6f6d 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.14 +version: 0.0.15 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index aa33fff..94dedf2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 7.5a7 -- November 15 2017 + * All Platforms + * Update Firefox to 52.5.0esr + * Update Tor to 0.3.2.4-alpha + * Update Torbutton to 1.9.8.3 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + * Update Tor Launcher to 0.2.14 + * Bug 23262: Implement integrated progress bar + * Bug 23261: implement configuration portion of new Tor Launcher UI + * Translations update + * Update HTTPS-Everywhere to 2017.10.30 + * Update NoScript to 5.1.5 + * Bug 23968: NoScript icon jumps to the right after update + * Update sandboxed-tor-browser to 0.0.15 + * Bug 10394: Don't autoupdate HTTPS Everywhere anymore + * Windows + * Bug 20636+10026: Create 64bit Tor Browser for Windows + * Bug 24052: Block file:// redirects early + Tor Browser 7.5a7 -- November 4 2017 * OS X * Bug 24052: Streamline handling of file:// resources diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6b7559a..06400be 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -66,9 +66,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - 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: 82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb + sha256sum: 0620b8608441b5a346e347a07ce3c1e707edc8d4d04f2c72af53e73a0d9b6d5c - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ce9cc90..69da745 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.13 +version: 0.2.14 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index af829cd..e704f13 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.3.2.2-alpha +version: 0.3.2.4-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 6e45ef8..f92bb48 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.2 +version: 1.9.8.3 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 34a22bf..394be49 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a7' + torbrowser_version: '7.5a8' torbrowser_build: 'build1' torbrowser_incremental_from: - 7.5a6 + - 7.5a7 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Added missing sandboxed-tor-browser item in Changelog
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c753150dde708c77b74b5f673e7f2563828d9edf Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 11:05:14 2017 +0000 Added missing sandboxed-tor-browser item in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 30b3cf9..aa33fff 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -28,6 +28,7 @@ Tor Browser 7.5a6 -- October 19 2017 * Update NoScript to 5.1.2 * Bug 23723: Loading entities from NoScript .dtd files is blocked * Bug 23724: NoScript update breaks Security Slider and its icon disappears + * Update sandboxed-tor-browser to 0.0.14 * Bug 23745: Tab crashes when using Tor Browser to access Google Drive * Bug 23694: Update the detailsURL in update responses * Bug 22501: Requests via javascript: violate FPI

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 79eda21ffabcdd4c3b5b4e8aedccf0cf3111ad26 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 17:24:49 2017 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index ae44aa6..e660e2f 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.13</em:version> + <em:version>0.2.14</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-browser-build/master] Bug 20636: remove fte from bridge_prefs.js for Windows 64
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 3c517c1a36a4e9f1251679fc4c129569a874be76 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 9 11:18:18 2017 +0100 Bug 20636: remove fte from bridge_prefs.js for Windows 64 --- projects/tor-browser/build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index f9740f7..022d6e9 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -118,7 +118,10 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TB [% END -%] [% IF c("var/windows") -%] # We don't have snowflake available on Windows yet - grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH + # We don't have fte available on Windows x86_64 yet + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ + >> $TBDIR/$EXTOVERRIDESPATH [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495.

1 0

[tor-browser/tor-browser-52.4.1esr-7.5-1] Bug 24052: Handle redirects by blocking them early
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit a99a3504e931768ce57dd26d3ae784576da7c5ac Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 1 02:33:18 2017 -0700 Bug 24052: Handle redirects by blocking them early This is the second part of the workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. --- netwerk/protocol/http/nsHttpChannel.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 0e570e8cb57d..b38be48bf0c9 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) return NS_ERROR_CORRUPTED_CONTENT; } + bool isRedirectToFile = false; + rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); + if (!NS_FAILED(rv) && isRedirectToFile) { + LOG(("Attempted to redirect from a remote page to a file:// URI.")); + return NS_ERROR_FAILURE; + } + if (mApplicationCache) { // if we are redirected to a different origin check if there is a fallback // cache entry to fall back to. we don't care about file strict

1 0

[tor-browser/tor-browser-52.4.1esr-7.5-1] Bug 24052: Streamline handling of file:// resources
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit c6e2b905b793c803c73b7d3e5a1a2926e34df8f2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 27 20:40:57 2017 +0000 Bug 24052: Streamline handling of file:// resources We should make sure restrictions regarding loading of file:// resources are adhered to more strictly, at least on *nix platforms. This is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. --- netwerk/base/nsIOService.cpp | 8 ++++++++ netwerk/protocol/file/nsFileProtocolHandler.cpp | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index 0da79c18ae41..0cc67da7b18f 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -789,12 +789,20 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, // if calling newChannel2() fails we try to fall back to // creating a new channel by calling NewChannel(). if (NS_FAILED(rv)) { +#ifdef XP_UNIX + if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) { + return rv; + } else { +#endif rv = handler->NewChannel(aURI, getter_AddRefs(channel)); NS_ENSURE_SUCCESS(rv, rv); // The protocol handler does not implement NewChannel2, so // maybe we need to wrap the channel (see comment in MaybeWrap // function). channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo); +#ifdef XP_UNIX + } +#endif } } diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp index e55cb9d47460..c24c928b6f02 100644 --- a/netwerk/protocol/file/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp @@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri, nsILoadInfo* aLoadInfo, nsIChannel** result) { +#ifdef XP_UNIX + if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) { + if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) { + return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; + } + } +#endif nsFileChannel *chan = new nsFileChannel(uri); if (!chan) return NS_ERROR_OUT_OF_MEMORY;

1 0

[torbutton/master] Version bump and CHANGELOG update
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 787d41133a5bafc76fa88ec64707b89ef512df71 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 10:16:59 2017 +0000 Version bump and CHANGELOG update --- src/CHANGELOG | 6 ++++++ src/install.rdf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index d2209b0..f0dac84 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,9 @@ +1.9.8.3 + * Bug 23997: Add link to Tor Browser manual for de, nl, tr, vi + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + 1.9.7.9 * Bug 23949: Fix donation banner display * Update locales with translated banner diff --git a/src/install.rdf b/src/install.rdf index 30f2ddd..423edd7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.8.2</em:version> + <em:version>1.9.8.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/master] Fold in stable changelogs
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit b4add1679579c443274987229963a14643290437 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 9 10:14:06 2017 +0000 Fold in stable changelogs --- src/CHANGELOG | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0eb1e0e..d2209b0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,7 +1,22 @@ +1.9.7.9 + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + 1.9.8.2 * Bug 23887: Update banner locales and Mozilla text * Translations update +1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + 1.9.8.1 * Bug 20375: Warn users after entering fullscreen mode * Bug 22989: Fix dimensions of new windows on macOS @@ -9,6 +24,14 @@ * Bug 23483: Donation banner on about:tor for 2017 (testing mode) * Translations Update +1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + +1.9.7.6 + * Bug 22989: Fix dimensions of new windows on macOS + * Translations update + 1.9.8 * Bug 22610: Avoid crashes when canceling external helper app related downloads * Bug 22472: Fix FTP downloads when external helper app dialog is shown @@ -22,6 +45,14 @@ * Code clean-up * Translations update +1.9.7.5 + * Bug 21999: Fix display of language prompt in non-en-US locales + * Bug 18193: Don't let about:tor have chrome privileges + * Bug 22535: Search on about:tor discards search query + * Bug 21948: Going back to about:tor page gives "Address isn't valid" error + * Code clean-up + * Translations update + 1.9.7.4 * Bug 22542: Security Settings window too small on macOS 10.12

1 0

[tor-browser-build/master] Bug 20636: fix Windows 64 expert bundle filename
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit d37b7a0e0de0057a7a44ae36ac6f10a849299e2a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 21:18:19 2017 +0100 Bug 20636: fix Windows 64 expert bundle filename --- projects/tor/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/tor/build b/projects/tor/build index 86d4384..24617ce 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -105,9 +105,10 @@ cd $distdir mkdir -p [% dest_dir _ '/' _ c('filename') %] [% IF c("var/expert_bundle"); + SET win_arch = c('var/windows-x86_64') ? 'win64' : 'win32'; c('zip', { zip_src => [ 'Data', 'Tor', ], - zip_args => dest_dir _ '/' _ c('filename') _ '/tor-win32-' _ c("version") _ '.zip', + zip_args => dest_dir _ '/' _ c('filename') _ '/tor-' _ win_arch _ '-' _ c("version") _ '.zip', }); ELSE; IF c("var/osx");

1 0

[tor-browser-build/master] Bug 20636: fix tor-browser bundle step for Windows 64
by gk＠torproject.org 09 Nov '17

09 Nov '17

commit 5a89431f10be74e1f08cdd804d24999ffd899426 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 6 13:01:25 2017 +0100 Bug 20636: fix tor-browser bundle step for Windows 64 --- projects/tor-browser/build | 4 ++-- projects/tor-browser/config | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 6540245..f9740f7 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -270,7 +270,7 @@ cd $distdir python $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe torbrowser-install.exe rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe + mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.exe popd [% END %] rm -rf $distdir/${PKG_DIR} @@ -344,7 +344,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ python $rootdir/pe_checksum_fix.py mv torbrowser-install-tmp2.exe torbrowser-install.exe rm torbrowser-install-tmp.exe - mv torbrowser-install.exe $OUTDIR/torbrowser-install-[% c("var/torbrowser_version") %]_[% lang %].exe + mv torbrowser-install.exe $OUTDIR/torbrowser-install[% IF c("var/windows-x86_64") %]-win64[% END %]-[% c("var/torbrowser_version") %]_[% lang %].exe popd [% END %] rm -rf [% tbdir %] diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 54a0e9e..6b7559a 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -24,11 +24,20 @@ targets: - python - bzip2 - faketime - windows-i686: + windows: var: - mar_osname: win32 arch_deps: - python-pefile + windows-i686: + var: + mar_osname: win32 + windows-x86_64: + var: + mar_osname: win64 + # We use a 32bit container to be able to use a 32bit nsis and + # pe_checksum_fix.py + container: + arch: i386 input_files: - project: container-image

1 0