December 2015 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 17009: Pref to suppress some modifier key events
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit b1e0a3252e5d556652d71d16dd501317196a5a66 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 23 10:20:44 2015 -0700 Bug 17009: Pref to suppress some modifier key events --- layout/base/nsIPresShell.h | 3 +++ layout/base/nsPresShell.cpp | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h index 2e74cae..3369d1f 100644 --- a/layout/base/nsIPresShell.h +++ b/layout/base/nsIPresShell.h @@ -1811,6 +1811,9 @@ protected: // to true, so we can avoid any paint calls for widget related to this // presshell. bool mIsNeverPainting; + + // If true, don't report Alt, Shift, and AltGr KeyboardEvents to content. + static bool sSuppressModifierKeyEvents; }; NS_DEFINE_STATIC_IID_ACCESSOR(nsIPresShell, NS_IPRESSHELL_IID) diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 938df78..e64584f 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -205,6 +205,7 @@ nsRefPtrHashtable<nsUint32HashKey, dom::Touch>* nsIPresShell::gCaptureTouchList; nsClassHashtable<nsUint32HashKey, nsIPresShell::PointerCaptureInfo>* nsIPresShell::gPointerCaptureList; nsClassHashtable<nsUint32HashKey, nsIPresShell::PointerInfo>* nsIPresShell::gActivePointersIds; bool nsIPresShell::gPreventMouseEvents = false; +bool nsIPresShell::sSuppressModifierKeyEvents = false; // convert a color value to a string, in the CSS format #RRGGBB // * - initially created for bugs 31816, 20760, 22963 @@ -7187,6 +7188,16 @@ PresShell::HandleKeyboardEvent(nsINode* aTarget, nsEventStatus* aStatus, EventDispatchingCallback* aEventCB) { + if (nsContentUtils::ResistFingerprinting() && sSuppressModifierKeyEvents) { + nsString keyName; + aEvent.GetDOMKeyName(keyName); + if (keyName.Equals(NS_LITERAL_STRING("Shift")) || + keyName.Equals(NS_LITERAL_STRING("Alt")) || + keyName.Equals(NS_LITERAL_STRING("AltGraph"))) { + aEvent.mFlags.mOnlyChromeDispatch = true; + } + } + if (aEvent.message == NS_KEY_PRESS || !BeforeAfterKeyboardEventEnabled()) { EventDispatcher::Dispatch(aTarget, mPresContext, @@ -10866,6 +10877,8 @@ void nsIPresShell::InitializeStatics() gCaptureTouchList = new nsRefPtrHashtable<nsUint32HashKey, dom::Touch>; gPointerCaptureList = new nsClassHashtable<nsUint32HashKey, PointerCaptureInfo>; gActivePointersIds = new nsClassHashtable<nsUint32HashKey, PointerInfo>; + Preferences::AddBoolVarCache(&sSuppressModifierKeyEvents, + "privacy.suppressModifierKeyEvents", false); } void nsIPresShell::ReleaseStatics()

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit b1c9000a21e664f7978c8dd9f18f9d47663f49c8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Sep 23 10:47:36 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 4205b4b..ed0d3ce 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -120,6 +120,7 @@ pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API pref("privacy.resistFingerprinting", true); pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks +pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser-bundle/maint-5.0] Changelog update; version bumps
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit adbac2a1b7b172ce6314fd17d3cfc5318bf5a5a7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 10:36:03 2015 +0000 Changelog update; version bumps --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6def594..89e56e7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,16 +5,18 @@ Tor Browser 5.0.5 -- December 15 2015 * Update OpenSSL to 1.0.1q * Update NoScript to 2.7 * Update HTTPS Everywhere to 5.1.1 - * Update Torbutton to 1.9.3.6 + * Update Torbutton to 1.9.3.7 * Bug 16990: Avoid matching '250 ' to the end of node name * Bug 17565: Tor fundraising campaign donation banner * Bug 17770: Fix alignments on donation banner + * Bug 17792: Include donation banner in some non en-US Tor Browsers * Translation updates * Bug 17207: Hide MIME types and plugins from websites * Bug 16909+17383: Adapt to HTTPS-Everywhere build changes * Bug 16863: Avoid confusing error when loop.enabled is false * Bug 17502: Add a preference for hiding "Open with" on download dialog * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) + * Bug 16441: Suppress "Reset Tor Browser" prompt Tor Browser 5.0.4 -- November 3 2015 * All Platforms diff --git a/gitian/versions b/gitian/versions index b01e9f7..8e8cf7f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,10 +8,10 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 -TORBUTTON_TAG=1.9.3.6 +TORBUTTON_TAG=1.9.3.7 HTTPSE_TAG=5.1.1 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8

1 0

[torbutton/maint-1.9.3] Version bump, changelog update
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 524669e1542bc677b62d35acd2d71b63385d6ff5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 10:30:15 2015 +0000 Version bump, changelog update --- src/CHANGELOG | 3 ++- src/install.rdf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 7e7e05f..6a79e0c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,7 +1,8 @@ -1.9.3.6 +1.9.3.7 * Bug 16990: Avoid matching '250 ' to the end of node name * Bug 17565: Tor fundraising campaign donation banner * Bug 17770: Fix alignments on donation banner + * Bug 17792: Include donation banner in some non en-US Tor Browsers * Translation updates 1.9.3.5 diff --git a/src/install.rdf b/src/install.rdf index f05f184..8213204 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.3.6</em:version> + <em:version>1.9.3.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

[torbutton/maint-1.9.3] Bug 17792: Auto-adjust font size for donation banner l10n
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 8952236a3df76957ed1539f00c232978e032a59f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Dec 10 15:59:38 2015 -0800 Bug 17792: Auto-adjust font size for donation banner l10n --- src/chrome/content/aboutTor/aboutTor.xhtml | 66 +++++++++++++++++++++++++--- src/chrome/skin/aboutTor.css | 13 +++++- 2 files changed, 70 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index d9e7704..9ca9f31 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -169,18 +169,63 @@ window.addEventListener("pageshow", function() { // Donation banner constants let gBannerAlternates = ["lp", "cd", "rd"], - gBannerSuffixes = ["quote", "who", "speciality"], - populateBannerText = (suffix, alternate) => - document.getElementById("donation-banner-" + suffix).innerHTML - = gStringBundle.GetStringFromName("aboutTor.donationBanner." + - alternate + "." + suffix); + gBannerSuffixes = ["quote", "who", "speciality"]; + +// Change the font size of text in element by ratio. +let scaleFontBy = function (element, ratio) { + let style = window.getComputedStyle(element), + originalFontSize = parseFloat(style.fontSize), + targetFontSize = originalFontSize * ratio; + element.style.fontSize = targetFontSize + "px"; +}; + +// Shrink the font size if the text in the given element is overflowing. +let fitTextInElement = function(element) { + let style = window.getComputedStyle(element); + if (style.whiteSpace === "nowrap") { + // Look for horizontal overflow. + let elementWidth = element.getBoundingClientRect().width, + paddingWidth = parseFloat(style.paddingLeft) + + parseFloat(style.paddingRight), + targetWidth = elementWidth - paddingWidth, + textWidth = element.scrollWidth; + // Compute the appropriate font size to make the text fit. + let ratio = targetWidth / textWidth; + scaleFontBy(element, ratio); + } else { + // Look for vertical overflow. + let elementHeight = element.getBoundingClientRect().height, + paddingHeight = parseFloat(style.paddingTop) + + parseFloat(style.paddingBottom), + targetHeight = elementHeight - paddingHeight; + // Wrapping causes somewhat difficult-to-predict overflow. + // So shrink slightly and repeat. + let ratio = 0; + for (let i = 0; i < 100 && ratio < 1; ++i) { + let textHeight = element.scrollHeight; + ratio = targetHeight < textHeight ? 0.99 : 1; + if (ratio < 1) { + scaleFontBy(element, ratio); + } + } + } +}; + +// Put text of the appropriate locale into donation banner elements. +let populateBannerText = function (suffix, alternate) { + let text = gStringBundle.GetStringFromName("aboutTor.donationBanner." + + alternate + "." + suffix), + div = document.getElementById("donation-banner-" + suffix); + div.innerHTML = text; +}; // This function takes care of the donation banner. function setupDonationBanner() { try { - // Only show banner for US English + // Only show banner for locales for which we have translations. let browserLocale = Services.prefs.getCharPref("general.useragent.locale"); - if (browserLocale !== "en-US") { + if (!["en", "de", "fr", "nl", "ru", "sv", "tr", "zh"] + .some(code => browserLocale.startsWith(code))) { return; } // Only show banner until 2016 Jan 25. @@ -218,6 +263,13 @@ function setupDonationBanner() { } // Now we can show the banner. document.getElementById("donation-banner").style.display = "block"; + for (let id of ["donation-banner-quote", + "donate-button", + "donation-banner-who", + "donation-banner-speciality", + "donation-banner-plea"]) { + fitTextInElement(document.getElementById(id)); + } } ]]> </script> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 5f43f8c..138757a 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -380,6 +380,7 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { color: darkgreen; font-family: serif; font-size: 18px; + max-height: 64px; text-align: start; white-space: normal; } @@ -393,11 +394,13 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { #donation-banner-who { font-size: 19px; font-style: bold; + width: 420px; } #donation-banner-speciality { font-size: 13px; text-transform: uppercase; + width: 420px; } #donation-banner-plea { @@ -406,9 +409,13 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { font-size: 20px; color: darkgreen; left: 250px; - padding: 10px; + line-height: 42px; + height: 42px; + padding: 0px 5px 0px 5px; position: absolute; + text-align: center; top: 144px; + width: 200px; } #donate-button { @@ -417,8 +424,10 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { color: white; font-family: sans-serif; font-size: 20px; + height: 42px; left: 490px; - padding: 10px; + line-height: 42px; + padding: 0px 5px 0px 5px; position: absolute; text-align: center; top: 144px;

1 0

[tor-browser/tor-browser-38.4.0esr-5.5-1] Bug 16441: Suppress "Reset Tor Browser" prompt.
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 549d97d99b477b1764bb4875a964c0dbc6d694e3 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Dec 10 16:42:49 2015 -0500 Bug 16441: Suppress "Reset Tor Browser" prompt. --- browser/app/profile/000-tor-browser.js | 3 +++ tbb-tests/browser_tor_TB4.js | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index dc38ee4..4205b4b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -27,6 +27,9 @@ pref("browser.slowStartup.notificationDisabled", true); pref("browser.slowStartup.maxSamples", 0); pref("browser.slowStartup.samples", 0); +// Disable the "Refresh" prompt that is displayed for stale profiles. +pref("browser.disableResetPrompt", true); + // Disk activity: Disable Browsing History Storage pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index 00a5fc0..6defb92 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -17,6 +17,9 @@ let expectedPrefs = [ ["startup.homepage_welcome_url", ""], ["startup.homepage_override_url", ""], + // Disable the "Refresh" prompt that is displayed for stale profiles. + ["browser.disableResetPrompt", true], + // Disk activity: Disable Browsing History Storage ["browser.privatebrowsing.autostart", true], ["browser.cache.disk.enable", false], @@ -175,7 +178,7 @@ let getPref = function (prefName) { if (type === gPrefService.PREF_BOOL) return gPrefService.getBoolPref(prefName); if (type === gPrefService.PREF_STRING) return gPrefService.getCharPref(prefName); // Something went wrong. - throw new Error("Can't access pref."); + throw new Error("Can't access pref " + prefName); }; let testPref = function([key, expectedValue]) {

1 0

[tor-browser/tor-browser-38.5.0esr-5.0-1] Bug 16441: Suppress "Reset Tor Browser" prompt.
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit b97f8e248b868725f481fb1656e19d1536c96547 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Dec 10 16:42:49 2015 -0500 Bug 16441: Suppress "Reset Tor Browser" prompt. --- browser/app/profile/000-tor-browser.js | 3 +++ tbb-tests/browser_tor_TB4.js | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6e75298..e81ac02 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -22,6 +22,9 @@ pref("browser.slowStartup.notificationDisabled", true); pref("browser.slowStartup.maxSamples", 0); pref("browser.slowStartup.samples", 0); +// Disable the "Refresh" prompt that is displayed for stale profiles. +pref("browser.disableResetPrompt", true); + // Disk activity: Disable Browsing History Storage pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index 00a5fc0..6defb92 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -17,6 +17,9 @@ let expectedPrefs = [ ["startup.homepage_welcome_url", ""], ["startup.homepage_override_url", ""], + // Disable the "Refresh" prompt that is displayed for stale profiles. + ["browser.disableResetPrompt", true], + // Disk activity: Disable Browsing History Storage ["browser.privatebrowsing.autostart", true], ["browser.cache.disk.enable", false], @@ -175,7 +178,7 @@ let getPref = function (prefName) { if (type === gPrefService.PREF_BOOL) return gPrefService.getBoolPref(prefName); if (type === gPrefService.PREF_STRING) return gPrefService.getCharPref(prefName); // Something went wrong. - throw new Error("Can't access pref."); + throw new Error("Can't access pref " + prefName); }; let testPref = function([key, expectedValue]) {

1 0

[tor-browser-bundle/maint-5.0] Bug 16960: OS X nightly tor target is broken
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 21c5686de61be2779dd0c5c4e87cfa70273a8646 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 19:01:57 2015 +0000 Bug 16960: OS X nightly tor target is broken Commit b79e90f6ba9426158cf305655590f70d3ae89875 (which fixed bug 16901) makes it necessary to update our CFLAGS for cross-compiling tor for OS X. --- gitian/descriptors/mac/gitian-tor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 92f7c57..a6824c0 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -45,7 +45,7 @@ script: | # Building tor # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CFLAGS="-m64 -I${INSTDIR}/openssl/include -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor git update-index --refresh -q

1 0

[tor-browser-bundle/maint-5.0] Bumping tor version to 0.2.7.6
by gk＠torproject.org 11 Dec '15

11 Dec '15

commit 5e1b891e6d9884daa502181582beddd054a9e7a1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 11 07:49:12 2015 +0000 Bumping tor version to 0.2.7.6 --- 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 a66ff84..6def594 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 5.0.5 -- December 15 2015 * All Platforms * Update Firefox to 38.5.0esr - * Update Tor to 0.2.7.5 + * Update Tor to 0.2.7.6 * Update OpenSSL to 1.0.1q * Update NoScript to 2.7 * Update HTTPS Everywhere to 5.1.1 diff --git a/gitian/versions b/gitian/versions index a229fb1..b01e9f7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 -TOR_TAG=tor-0.2.7.5 +TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.6 HTTPSE_TAG=5.1.1

1 0

[webwml/master] fix the 'about' and 'contact' links from the donate page
by arma＠torproject.org 11 Dec '15

11 Dec '15

commit 0c76ed024e7b8a284592ce7055c8f67319bfe3ee Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Dec 11 02:15:54 2015 -0500 fix the 'about' and 'contact' links from the donate page should address ticket #17814 --- include/donatehead.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/donatehead.wmi b/include/donatehead.wmi index 29145f5..04a5bf1 100644 --- a/include/donatehead.wmi +++ b/include/donatehead.wmi @@ -34,8 +34,8 @@ </div> <ul id="navbar" class="nav navbar-nav navbar-right"> <li><a href="<page index>">Home</a></li> - <li><a href="<page index>/about">About</a></li> - <li><a href="<page index>/contact">Contact</a></li> + <li><a href="<page about/overview>">About</a></li> + <li><a href="<page about/contact>">Contact</a></li> </ul> </div> </nav>

1 0