- tbb-commits - lists.torproject.org

[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

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

15 Nov '16

commit 0a5af31aed37e4fd9faec408455b2d4ae139841e 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

[tor-browser-bundle/hardened-builds] Bumping tor-browser branch for hardened nightlies
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 1cec0b4eff14c753c2bc2ece022926350e03e297 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:41:26 2016 +0000 Bumping tor-browser branch for hardened nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index ffa3809..56af58d 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=default

1 0

[tor-browser-bundle/master] Bumping tor-browser branch for nightlies
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 378d6fe95d797ecca6b8aebda169b333da7ec8db Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:39:42 2016 +0000 Bumping tor-browser branch for nightlies --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f9cfbfb..1a3bc8b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,7 +17,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=default

1 0

[tor-launcher/master] Version bump (0.2.11.1)
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 81b73ec3c046ee7eb6bff42019596e34815fddec Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:32:16 2016 +0000 Version bump (0.2.11.1) --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 48599a7..493d976 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.11</em:version> + <em:version>0.2.11.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser-bundle/hardened-builds] Release preparations for 6.5a4-hardened
by gk＠torproject.org 14 Nov '16

14 Nov '16

commit 0cbe69dbc243ee09a9c536ed43ef705609c68e1e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 14 08:06:44 2016 +0000 Release preparations for 6.5a4-hardened Version bumps, Changelog update, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 48 +++++++++++++++++++++++++++++++++++++++ gitian/versions.alpha | 16 ++++++------- tools/update-responses/config.yml | 10 ++++---- 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 68a9d43..fd5b60e 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.5a3-hardened -- September 20 2016 * All Platforms * Update Firefox to 45.4.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 02e2bbd..c22ed9f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,15 +14,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=45.4.0esr +FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 -TOR_TAG=tor-0.2.9.2-alpha -TORLAUNCHER_TAG=0.2.11 -TORBUTTON_TAG=1.9.6.4 -HTTPSE_TAG=5.2.4 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 +TOR_TAG=tor-0.2.9.5-alpha +TORLAUNCHER_TAG=0.2.11.1 +TORBUTTON_TAG=1.9.6.7 +HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -49,7 +49,7 @@ SELFRANDO_TAG=44ac0df8c0e8eb291f2d913e2dd147000bf54863 GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.2h +OPENSSL_VER=1.0.2j GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 @@ -104,7 +104,7 @@ NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf ELFUTILS_PACKAGE=elfutils-${ELFUTILS_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 +OPENSSL_HASH=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 022cea2..67d63c9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,7 +20,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - hardened: 6.5a3-hardened + hardened: 6.5a4-hardened release: 6.0.1 versions: 6.0.1: @@ -33,11 +33,11 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.5a3-hardened: - platformVersion: 45.4.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-65a3-hardened-released + 6.5a4-hardened: + platformVersion: 45.5.0 + detailsURL: https://blog.torproject.org/blog/tor-browser-65a4-hardened-released incremental_from: - - 6.5a2-hardened + - 6.5a3-hardened migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Pick up banner changes and DuckDuckGo fix
by gk＠torproject.org 13 Nov '16

13 Nov '16

commit 7eda07be5c2afbd7f3a6ae36941520de71a91725 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 13 10:05:04 2016 +0000 Pick up banner changes and DuckDuckGo fix --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions.alpha | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 424f09b..021055f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5a4 -- November 16 2016 * 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.6 + * 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 @@ -38,6 +38,7 @@ Tor Browser 6.5a4 -- November 16 2016 * 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 * Windows * Bug 20342: Add tor-gencert.exe to expert bundle diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a8fff36..432cf29 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build3 TOR_TAG=tor-0.2.9.5-alpha TORLAUNCHER_TAG=0.2.10.2 -TORBUTTON_TAG=1.9.6.6 +TORBUTTON_TAG=1.9.6.7 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Pickup final banner changes
by gk＠torproject.org 13 Nov '16

13 Nov '16

commit 568371300c000cae94e9fd5c0ca07bc9f8ca56c0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Nov 13 10:01:53 2016 +0000 Pickup final 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 a89302f..35c9d59 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.6.6 +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 diff --git a/src/install.rdf b/src/install.rdf index 994aa5c..15c9f33 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.6.6</em:version> + <em:version>1.9.6.7</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

[tor-browser/tor-browser-45.5.0esr-6.5-1] fixup! fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 13 Nov '16

13 Nov '16

commit 3176fe575acf7eaf63f538074f398daea46ebf66 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 12 13:03:30 2016 +0000 fixup! fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing DuckDuckGo should work as well by default with JavaScript disabled. --- browser/locales/en-US/searchplugins/ddg.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml index aceb0ac..8318746 100644 --- a/browser/locales/en-US/searchplugins/ddg.xml +++ b/browser/locales/en-US/searchplugins/ddg.xml @@ -22,7 +22,7 @@ AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD AADwDwAA+B8AAA==</Image> -<Url type="text/html" method="POST" template="https://duckduckgo.com/"> +<Url type="text/html" method="POST" template="https://duckduckgo.com/html"> <Param name="q" value="{searchTerms}"/> </Url> <SearchForm>https://duckduckgo.com/</SearchForm>

1 0

[tor-browser-bundle/maint-6.0] Picking up banner and search engine improvements
by gk＠torproject.org 12 Nov '16

12 Nov '16

commit 988ef9708767ea872e6d45e02ef2ceb6b38176a8 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 12 13:06:42 2016 +0000 Picking up banner and search engine improvements --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 226c472..0c0cec0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -14,10 +14,10 @@ FIREFOX_VERSION=45.5.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 +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.10 +TORBUTTON_TAG=1.9.5.11 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser/tor-browser-45.5.0esr-6.0-1] fixup! fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 12 Nov '16

12 Nov '16

commit c9b21560547b517879ce37edd07cbbec5eedd4b1 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 12 13:03:30 2016 +0000 fixup! fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing DuckDuckGo should work as well by default with JavaScript disabled. --- browser/locales/en-US/searchplugins/ddg.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/ddg.xml b/browser/locales/en-US/searchplugins/ddg.xml index aceb0ac..8318746 100644 --- a/browser/locales/en-US/searchplugins/ddg.xml +++ b/browser/locales/en-US/searchplugins/ddg.xml @@ -22,7 +22,7 @@ AScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAA AAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMAD AADwDwAA+B8AAA==</Image> -<Url type="text/html" method="POST" template="https://duckduckgo.com/"> +<Url type="text/html" method="POST" template="https://duckduckgo.com/html"> <Param name="q" value="{searchTerms}"/> </Url> <SearchForm>https://duckduckgo.com/</SearchForm>

1 0

[torbutton/maint-1.9.5] Bump version to pick up banner improvements
by gk＠torproject.org 12 Nov '16

12 Nov '16

commit 1a79b90c4cf41558d2b637b6314e0c64338d158d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 12 12:44:54 2016 +0000 Bump version to pick up banner improvements --- src/CHANGELOG | 2 +- src/install.rdf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 8f19f42..0ac3291 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.5.10 +1.9.5.11 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates diff --git a/src/install.rdf b/src/install.rdf index d518982..12a67bc 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.10</em:version> + <em:version>1.9.5.11</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.4: Delay banner 1 more day and fix minor error in code
by gk＠torproject.org 12 Nov '16

12 Nov '16

commit 653028f43e5a753197cb0051c69fcf33813a1eba Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 11 21:11:08 2016 -0800 Bug 20414.4: Delay banner 1 more day and fix minor error in code --- src/chrome/content/aboutTor/donation_banner.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 727d984..0953ed2 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -59,9 +59,9 @@ let shouldShowBanner = function () { kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) { return false; } - // Only show banner between 2016 Nov 22 and 2017 Jan 25. + // Only show banner between 2016 Nov 23 and 2017 Jan 25. let now = new Date(); - let start = new Date(2016, 10, 22); + let start = new Date(2016, 10, 23); let end = new Date(2017, 0, 26); let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count"; if (now < start || now > end) { @@ -175,7 +175,7 @@ let observeAttribute = function (target, attributeName, callback) { } }); }); - observer.observe(document.body, { attributes: true }); + observer.observe(target, { attributes: true }); return () => observer.disconnect(); };

1 0

[torbutton/master] Bug 20414.4: Delay banner 1 more day and fix minor error in code
by gk＠torproject.org 12 Nov '16

12 Nov '16

commit 2f8570e04f2465710b02abaf1e0cfd3059580134 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 11 21:11:08 2016 -0800 Bug 20414.4: Delay banner 1 more day and fix minor error in code --- src/chrome/content/aboutTor/donation_banner.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 727d984..0953ed2 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -59,9 +59,9 @@ let shouldShowBanner = function () { kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) { return false; } - // Only show banner between 2016 Nov 22 and 2017 Jan 25. + // Only show banner between 2016 Nov 23 and 2017 Jan 25. let now = new Date(); - let start = new Date(2016, 10, 22); + let start = new Date(2016, 10, 23); let end = new Date(2017, 0, 26); let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count"; if (now < start || now > end) { @@ -175,7 +175,7 @@ let observeAttribute = function (target, attributeName, callback) { } }); }); - observer.observe(document.body, { attributes: true }); + observer.observe(target, { attributes: true }); return () => observer.disconnect(); };

1 0

[tor-browser-bundle/master] Adding bug numbers fixed by #19459
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit 776e2e730b723b0224656b5eda8fb5bf1b46f482 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 11:53:33 2016 +0000 Adding bug numbers fixed by #19459 --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6efa439..424f09b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -41,10 +41,15 @@ Tor Browser 6.5a4 -- November 16 2016 * Bug 20399+15852: Code clean-up * Windows * Bug 20342: Add tor-gencert.exe to expert bundle + * Bug 18175: Maximizing window and restarting leads to non-rounded window size + * Bug 13437: Rounded inner window accidentally grows to non-rounded size * 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 + * Bug 20590: Badly resized window due to security slider notification bar on OS X * Bug 20439: Make the build PIE on OSX + * Linux + * Bug 15953: Weird resizing dance on Tor Browser startup * Build system * All platforms * Bug 20023: Upgrade Go to 1.7.3

1 0

[tor-browser-bundle/master] Pick up latest donation banner changes
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit 6e8555daebfc4a1ad664ff03c7273b95bfe02a44 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:42:51 2016 +0000 Pick up latest donation banner changes --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6d5d66b..6efa439 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 6.5a4 -- November 16 2016 * 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.5 + * Update Torbutton to 1.9.6.6 * 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 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 55ebb2e..a8fff36 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1-build2 TOR_TAG=tor-0.2.9.5-alpha TORLAUNCHER_TAG=0.2.10.2 -TORBUTTON_TAG=1.9.6.5 +TORBUTTON_TAG=1.9.6.6 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-6.0] Pick up latest donation banner changes
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit a28df60e59e8ef3e328a95f04e8f8adb5750f0e5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:30:29 2016 +0000 Pick up latest donation 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 e6f9b74..75a6fc3 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.9 + * Update Torbutton to 1.9.5.10 * 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 bb83b2d..226c472 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2 TOR_TAG=tor-0.2.8.9 TORLAUNCHER_TAG=0.2.9.4 -TORBUTTON_TAG=1.9.5.9 +TORBUTTON_TAG=1.9.5.10 HTTPSE_TAG=5.2.7 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/maint-1.9.5] Update pt translation, CHANGELOG and Torbutton version
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit e6ce4a86360b4b17f690dcd229bb8b478fa19679 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 11 10:25:37 2016 +0000 Update pt translation, CHANGELOG and Torbutton version --- src/CHANGELOG | 2 +- src/chrome/locale/pt/aboutTor.properties | 12 ++++++------ src/install.rdf | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index db42f82..8f19f42 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,4 +1,4 @@ -1.9.5.9 +1.9.5.10 * Bug 20414: Add donation banner on about:tor for 2016 campaign * Translation updates diff --git a/src/chrome/locale/pt/aboutTor.properties b/src/chrome/locale/pt/aboutTor.properties index f9b6dbf..f8f6235 100644 --- a/src/chrome/locale/pt/aboutTor.properties +++ b/src/chrome/locale/pt/aboutTor.properties @@ -20,9 +20,9 @@ aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ -aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.heart=Tor is at the heart of Internet freedom -aboutTor.donationBanner.tagline1=Millions of People Depend on Tor for Online Security & Privacy -aboutTor.donationBanner.tagline2=A Network of People Protecting People -aboutTor.donationBanner.tagline3=Surveillance = Oppression -aboutTor.donationBanner.tagline4=Protecting Journalists, Activists & Whistleblowers Since 2006 +aboutTor.donationBanner.donate=Doe Agora! +aboutTor.donationBanner.heart=O Tor é o coração da liberdade na Internet +aboutTor.donationBanner.tagline1=Milhares de pessoas dependem do Tor para Segurança & Privacidade Online +aboutTor.donationBanner.tagline2=Uma Rede de Pessoas Protegendo Pessoas +aboutTor.donationBanner.tagline3=Vigilância = Opressão +aboutTor.donationBanner.tagline4=Protegendo Jornalistas, Ativistas & Denunciantes Desde 2006 diff --git a/src/install.rdf b/src/install.rdf index 16adb7e..d518982 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.9</em:version> + <em:version>1.9.5.10</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.3: Delay banner 1 week & add pt locale
by gk＠torproject.org 11 Nov '16

11 Nov '16

commit ba95ab383ce6ecdcdba9cc905095b0a85ad1b08e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Nov 10 23:26:47 2016 -0800 Bug 20414.3: Delay banner 1 week & add pt locale Also, improve donate button appearance by moving arrow below text and choosing a narrow arrow. --- src/chrome/content/aboutTor/aboutTor.xhtml | 4 +++- src/chrome/content/aboutTor/donation_banner.js | 11 ++++++----- src/chrome/skin/donation_banner.css | 19 ++++++++++++++----- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 1ecae65..b6860d8 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -180,7 +180,9 @@ window.addEventListener("pageshow", function() { href="https://www.torproject.org/donate/donate-tbb"> <div id="banner-donate-button-container"> <div id="banner-donate-button"> - <div id="banner-donate-button-text"></div> + <div id="banner-donate-button-text"> + <span></span> + </div> <div id="banner-donate-button-arrow"></div> </div> </div> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 04f8db9..727d984 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -9,6 +9,7 @@ let kBannerLocales = [ "fr", "it", "nl", + "pt", "ru", "tr", "vi", @@ -58,9 +59,9 @@ let shouldShowBanner = function () { kDonationPageLocales.indexOf(kBrowserLocaleShort) === -1) { return false; } - // Only show banner between 2016 Nov 15 and 2017 Jan 25. + // Only show banner between 2016 Nov 22 and 2017 Jan 25. let now = new Date(); - let start = new Date(2016, 10, 15); + let start = new Date(2016, 10, 22); let end = new Date(2017, 0, 26); let shownCountPref = "extensions.torbutton.donation_banner2016.shown_count"; if (now < start || now > end) { @@ -122,7 +123,7 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-heart")); - fitTextInElement(sel("#banner-donate-button")); + fitTextInElement(sel("#banner-donate-button-text")); avoidWidows(sel("#banner-tagline span")); }; @@ -143,9 +144,9 @@ let runDonationBanner = function () { sel("#banner-tagline span").innerText = getTagline(randomInteger(4)); sel("#banner-heart span").innerText = gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); - sel("#banner-donate-button-text").innerHTML = + 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 8ad3f88..06d6194 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -96,10 +96,10 @@ letter-spacing: -0.00em; opacity: 100%; padding-bottom: 5px; - padding-left: 15px; - padding-right: 15px; + padding-left: 5px; + padding-right: 5px; padding-top: 5px; - width: 80px; + width: 100px; } #banner-donate-button-container:hover { border-color: #610; @@ -110,16 +110,25 @@ #banner-donate-button { align-items: center; display: flex; + flex-direction: column; font-family: sans-serif; font-size: 12px; font-weight: bold; height: 100%; - text-align: start; + text-align: center; width: 100%; } +#banner-donate-button-text { + align-self: stretch; + align-items: center; + display: flex; + justify-content: center; + flex: 2 2 67%; +} #banner-donate-button-arrow { + flex: 1 1 33%; font-size: 14px; - margin-inline-start: 5px; + line-height: 14px; } #banner-donate-button-arrow:-moz-dir(rtl) { transform: scaleX(-1);

1 0