- tbb-commits - lists.torproject.org

[torbutton/master] Bug 20728: Fix bad preferences.xul dimensions
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit d3aa9fed9b0feffd5cc046d0729fc90c7c53c96e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 21 10:15:53 2016 -0800 Bug 20728: Fix bad preferences.xul dimensions --- src/chrome/content/preferences.xul | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index c6432e0..bb6e31f 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -13,9 +13,9 @@ onload="torbutton_init_security_ui()" align="stretch" pack="center" - maxheight="300" - minwidth="300" - maxwidth="400" + maxheight="350" + minwidth="400" + maxwidth="600" ondialogaccept="torbutton_save_security_settings()" width="400" > @@ -57,9 +57,7 @@ </vbox> </hbox> </vbox> -  - <vbox flex="1" width="300" style="overflow: auto;"> + <vbox flex="1" width="400" style="overflow: auto;"> <vbox id="desc_high" collapsed="true"> <description class="slider-text-size, slider-text-weight">

1 0

[torbutton/master] Bug 20701: Allow the directory listing stylesheet in the content policy.
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 15496115caf82ed6865fa219c2eed4bc59363388 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Nov 17 18:54:41 2016 +0000 Bug 20701: Allow the directory listing stylesheet in the content policy. --- src/components/content-policy.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/content-policy.js b/src/components/content-policy.js index 3379eb7..5c0ecf5 100644 --- a/src/components/content-policy.js +++ b/src/components/content-policy.js @@ -37,6 +37,9 @@ ContentPolicy.prototype = { // Resizing text boxes. "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, + + // Directory listing. + "chrome://global/skin/dirListing/dirListing.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, }, shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) {

1 0

[torbutton/master] Bug 20318: Remove helpdesk link from about:tor
by gk＠torproject.org 21 Nov '16

21 Nov '16

commit 4f8b3fb92c080f25b4e80e59a377fae1e1b0c1fb Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 19 18:50:26 2016 +0000 Bug 20318: Remove helpdesk link from about:tor --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 --- src/chrome/locale/en/aboutTor.dtd | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b6860d8..2fffb2a 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -206,9 +206,6 @@ window.addEventListener("pageshow", function() { <h1>&aboutTor.failure.label;</h1> <br/> <h2>&aboutTor.failure2.label;</h2> - <br/> - <h3>&aboutTor.failure3prefix.label;<a href="mailto:&aboutTor.failure3Link;" ->&aboutTor.failure3Link;</a>&aboutTor.failure3suffix.label;</h3> </div> </div> <div class="top"> diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index d44f164..12313c4 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -17,9 +17,6 @@ <!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact "> -<!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> -<!ENTITY aboutTor.failure3suffix.label "."> <!ENTITY aboutTor.search.label "Search">

1 0

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit c556cdac99fcf4570feb4cfdb676fc56d384a101 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 12:01:44 2016 +0000 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. This fixes bug 20709. --- browser/app/profile/firefox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 64ab700..ce16a75 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -147,7 +147,7 @@ pref("app.update.badge", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://aus1.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGE…"); +pref("app.update.url", "https://aus1.torproject.org/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET%/%V…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section

1 0

[tor-browser-bundle/master] Bug 20704: fix mar files code signing check
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 234b76caf9c9743a43fcd1ff08f6f180ee981b20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 17 22:53:43 2016 +0100 Bug 20704: fix mar files code signing check --- tools/update-responses/config.yml | 1 - tools/update-responses/update_responses | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 786030d..2e48e2c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -3,7 +3,6 @@ appname_marfile: tor-browser appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser appname_bundle_win: torbrowser-install -appdir_osx: TorBrowser.app releases_dir: ../../gitian download: archive_url: https://archive.torproject.org/tor-package-archive/torbrowser diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index fd59132..b61e379 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -200,8 +200,8 @@ sub create_incremental_mar { extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { - unless (-f "$tmpdir/A/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources" - && -f "$tmpdir/B/$config->{appdir_osx}/Contents/_CodeSignature/CodeResources") { + unless (-f "$tmpdir/A/Contents/_CodeSignature/CodeResources" + && -f "$tmpdir/B/Contents/_CodeSignature/CodeResources") { exit_error "Missing code signature while creating $mar_file"; } }

1 0

[tor-browser-bundle/master] Bug 20706: make it possible to use dmg2mar in Tor Messenger
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 27e05dc5e3257afd2dbd11d83317001eee70b5f5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Nov 18 00:04:33 2016 +0100 Bug 20706: make it possible to use dmg2mar in Tor Messenger --- tools/dmg2mar | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/dmg2mar b/tools/dmg2mar index 8eaebe8..51d6acb 100755 --- a/tools/dmg2mar +++ b/tools/dmg2mar @@ -35,6 +35,12 @@ use File::Find; use Parallel::ForkManager; use Cwd; +# If the application is not TorBrowser (for instance, TorMessenger) +# set the application name in the TOR_APPNAME_BUNDLE_OSX and in +# the TOR_APPNAME_MARFILE environment variables +my $appname = $ENV{TOR_APPNAME_BUNDLE_OSX} // 'TorBrowser'; +my $appname_mar = $ENV{TOR_APPNAME_MARFILE} // 'tor-browser'; + sub exit_error { print STDERR "Error: ", $_[0], "\n"; chdir '/'; @@ -89,7 +95,7 @@ sub get_dmg_files_from_sha256sums { foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^TorBrowser-(.+)-osx64_(.+)\.dmg$/; + next unless $filename =~ m/^$appname-(.+)-osx64_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; } return @files; @@ -103,7 +109,7 @@ sub convert_files { # internally on OSX, but the dmg file still uses 'ja' to avoid # confusing users. my $mar_lang = $file->{lang} eq 'ja' ? 'ja-JP-mac' : $file->{lang}; - my $output = "tor-browser-osx64-$file->{version}_$mar_lang.mar"; + my $output = "$appname_mar-osx64-$file->{version}_$mar_lang.mar"; my $step_name = "$file->{filename} -> $output"; print "Starting $step_name\n"; $pm->start($step_name) and next; @@ -121,7 +127,7 @@ sub convert_files { unless system('mar', '-C', $tmpdir_oldmar, '-x', $oldmar) == 0; my $wanted = sub { my $file = $File::Find::name; - $file =~ s{^$tmpdir/TorBrowser\.app/}{}; + $file =~ s{^$tmpdir/$appname\.app/}{}; if (-f "$tmpdir_oldmar/$file") { my (undef, undef, $mode) = stat("$tmpdir_oldmar/$file"); chmod $mode, $File::Find::name; @@ -130,11 +136,11 @@ sub convert_files { chmod 0644, $File::Find::name if -f $File::Find::name; chmod 0755, $File::Find::name if -d $File::Find::name; }; - find($wanted, "$tmpdir/TorBrowser.app"); + find($wanted, "$tmpdir/$appname.app"); unlink $output; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', - $output, "$tmpdir/TorBrowser.app"); + $output, "$tmpdir/$appname.app"); exit_error "Error updating $output: $err" unless $success; $pm->finish; } @@ -147,7 +153,7 @@ sub remove_incremental_mars { foreach my $line (read_file('sha256sums-unsigned-build.incrementals.txt')) { my (undef, $filename) = split ' ', $line; chomp $filename; - next unless $filename =~ m/^tor-browser-osx64.+\.incremental\.mar$/; + next unless $filename =~ m/^$appname_mar-osx64.+\.incremental\.mar$/; next unless -f $filename; print "Removing $filename\n"; unlink $filename;

1 0

[tor-browser-bundle/master] Folding in 6.0.6 and 6.5a4-hardened changelogs
by gk＠torproject.org 18 Nov '16

18 Nov '16

commit 1762f089c0aa6fbf4e4c8b7e539c6ee8a61d74dc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 18 11:14:55 2016 +0000 Folding in 6.0.6 and 6.5a4-hardened changelogs --- Bundle-Data/Docs/ChangeLog.txt | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 021055f..4f57467 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,51 @@ +Tor Browser 6.5a4-hardened -- November 16 2016 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.9.5-alpha + * Update OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.7 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.11.1 + * Bug 20111: use Unix domain sockets for SOCKS port by default + * Bug 20185: Avoid using Unix domain socket paths that are too long + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Translation updates + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 20304: Support spaces and other special characters for SOCKS socket + * Bug 20490: Fix assertion failure due to fix for #20304 + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 20123: Always block remote jar files + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20399+15852: Code clean-up + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + * Bug 20583: Make the downloads.json file reproducible + Tor Browser 6.5a4 -- November 16 2016 * All Platforms * Update Firefox to 45.5.0esr @@ -60,6 +108,34 @@ Tor Browser 6.5a4 -- November 16 2016 * Bug 20184: Make OS X builds reproducible again * Bug 20210: In dmg2mar, extract old mar file to copy permissions to the new one +Tor Browser 6.0.6 -- November 15 + * All Platforms + * Update Firefox to 45.5.0esr + * Update Tor to 0.2.8.9 + * Update OpenSSL to 1.0.1u + * Update Torbutton to 1.9.5.12 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Translation updates + * Update Tor Launcher to 0.2.9.4 + * Bug 20429: Do not open progress window if tor doesn't get started + * Bug 19646: Wrong location for meek browser profile on OS X + * Update HTTPS-Everywhere to 5.2.7 + * Update meek to 0.25 + * Bug 19646: Wrong location for meek browser profile on OS X + * Bug 20030: Shut down meek-http-helper cleanly if built with Go > 1.5.4 + * Bug 19838: Add dgoulet's bridge and add another one commented out + * Bug 20296: Rotate ports again for default obfs4 bridges + * Bug 19735: Switch default search engine to DuckDuckGo + * Bug 20118: Don't unpack HTTPS Everywhere anymore + * Windows + * Bug 20342: Add tor-gencert.exe to expert bundle + * OS X + * Bug 20204: Windows don't drag on macOS Sierra anymore + * Bug 20250: Meek fails on macOS Sierra if built with Go < 1.7 + * Build system + * All platforms + * Bug 20023: Upgrade Go to 1.7.3 + Tor Browser 6.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr

1 0

[tor-browser-bundle/maint-6.0] Picking up the final banner changes
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit 7cdc9a89a33c9f0c61294424de584fcaf5012a63 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 15 07:53:49 2016 +0000 Picking up the final banner changes --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 75a6fc3..dd961a1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.0.6 -- November 15 * Update Firefox to 45.5.0esr * Update Tor to 0.2.8.9 * Update OpenSSL to 1.0.1u - * Update Torbutton to 1.9.5.10 + * Update Torbutton to 1.9.5.12 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates * Update Tor Launcher to 0.2.9.4 diff --git a/gitian/versions b/gitian/versions index 0c0cec0..6fed387 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build3 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 -TORBUTTON_TAG=1.9.5.11 +TORBUTTON_TAG=1.9.5.12 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/maint-1.9.5] Version bump to pick up latest banner changes
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit 07624f2b158bdbf17f8ae36fd7206cf850012508 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 15 07:44:41 2016 +0000 Version bump to pick up latest banner changes --- src/CHANGELOG | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0ac3291..2294b4e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.5.11 +1.9.5.12 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates diff --git a/src/install.rdf b/src/install.rdf index 12a67bc..2d45e80 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.5.11</em:version> + <em:version>1.9.5.12</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/maint-1.9.5] Bug 20414.5: Fix nonrendering arrow
by gk＠torproject.org 15 Nov '16

15 Nov '16

commit e22642323f09efd18b4315d0b7145a781bb3dbdc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 23 21:05:37 2016 -0800 Bug 20414.5: Fix nonrendering arrow --- src/chrome/content/aboutTor/donation_banner.js | 2 +- src/chrome/skin/donation_banner.css | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 0953ed2..2b59fd4 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -146,7 +146,7 @@ let runDonationBanner = function () { gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); sel("#banner-donate-button-text span").innerHTML = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - sel("#banner-donate-button-arrow").innerHTML = "⟶"; + sel("#banner-donate-button-arrow").innerHTML = "»"; sel("#banner").style.display = "flex"; sel("#banner-spacer").style.display = "block"; addEventListener("resize", updateTextSizes); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 06d6194..1d21641 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -127,11 +127,8 @@ } #banner-donate-button-arrow { flex: 1 1 33%; - font-size: 14px; - line-height: 14px; -} -#banner-donate-button-arrow:-moz-dir(rtl) { - transform: scaleX(-1); + font-size: 24px; + line-height: 24px; } #banner-donate-button-link { flex: 0 0 auto;

1 0