- tbb-commits - lists.torproject.org

[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