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

[tor-browser-bundle/maint-6.0] Taking donation banner improvements for build2
by gk＠torproject.org 12 Dec '16

12 Dec '16

commit 8ce5aec14b113e388c4f3fd84f4c7a59fb3cb484 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 12 08:09:56 2016 +0000 Taking donation banner improvements for build2 --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/versions | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 85147d0..21ab094 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,8 @@ Tor Browser 6.0.8 -- December 13 * All Platforms * Update Firefox to 45.6.0esr * Tor to 0.2.8.11 + * Update Torbutton to 1.9.5.13 + * Bug 20947: Donation banner improvements * Update HTTPS-Everywhere to 5.2.8 * Bug 20809: Use non-/html search engine URL for DuckDuckGo search plugins * Bug 20837: Activate iat-mode for certain obfs4 bridges diff --git a/gitian/versions b/gitian/versions index d78d2ce..048a933 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 TOR_TAG=tor-0.2.8.11 TORLAUNCHER_TAG=0.2.9.4 -TORBUTTON_TAG=1.9.5.12 +TORBUTTON_TAG=1.9.5.13 HTTPSE_TAG=5.2.8 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8

1 0

[torbutton/maint-1.9.5] Release preparations for 1.9.5.13
by gk＠torproject.org 12 Dec '16

12 Dec '16

commit 0f89bd00a61b398e4a3c6e6a9894a1af0104d87e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 12 08:06:20 2016 +0000 Release preparations for 1.9.5.13 Version bump and Changelog update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 2294b4e..042a4ab 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.5.13 + * Bug 20947: Donation banner improvements + 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 2d45e80..a336c16 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.12</em:version> + <em:version>1.9.5.13</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 20947: Raise 2016 donation banner limit and fix arrow
by gk＠torproject.org 12 Dec '16

12 Dec '16

commit 6447d7cccd169145941098e0cc7fe10b4ba026cb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Dec 11 09:51:37 2016 -0800 Bug 20947: Raise 2016 donation banner limit and fix arrow Also change the English text to "Please Donate!" --- src/chrome/content/aboutTor/aboutTor.xhtml | 1 - src/chrome/content/aboutTor/donation_banner.js | 8 ++++---- src/chrome/locale/en/aboutTor.properties | 2 +- src/chrome/locale/fr/aboutTor.properties | 2 +- src/chrome/skin/donation_banner.css | 12 ++---------- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b6860d8..4da9a5a 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -183,7 +183,6 @@ window.addEventListener("pageshow", function() { <div id="banner-donate-button-text"> <span></span> </div> - <div id="banner-donate-button-arrow"></div> </div> </div> </a> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 2b59fd4..9aa2373 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -69,12 +69,12 @@ let shouldShowBanner = function () { Services.prefs.clearUserPref(shownCountPref); return false; } - // Only show banner 10 times. + // Only show banner 50 times. let count = 0; if (Services.prefs.prefHasUserValue(shownCountPref)) { count = Services.prefs.getIntPref(shownCountPref); } - if (count >= 10) { + if (count >= 50) { return false; } Services.prefs.setIntPref(shownCountPref, count+1); @@ -125,6 +125,7 @@ let updateTextSizes = function () { fitTextInElement(sel("#banner-heart")); fitTextInElement(sel("#banner-donate-button-text")); avoidWidows(sel("#banner-tagline span")); + avoidWidows(sel("#banner-donate-button-text")); }; // Read the tagline with the given index. @@ -145,8 +146,7 @@ let runDonationBanner = function () { sel("#banner-heart span").innerText = gStringBundle.GetStringFromName("aboutTor.donationBanner.heart"); sel("#banner-donate-button-text span").innerHTML = - gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - sel("#banner-donate-button-arrow").innerHTML = "»"; + gStringBundle.GetStringFromName("aboutTor.donationBanner.donate") + " »"; sel("#banner").style.display = "flex"; sel("#banner-spacer").style.display = "block"; addEventListener("resize", updateTextSizes); diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 76192f4..931dcac 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -20,7 +20,7 @@ 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.donate=Please Donate! 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 diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index 9b9a7e6..6b9d3e6 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -20,7 +20,7 @@ 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=Faites un don maintenant ! +aboutTor.donationBanner.donate=Faites un don maintenant ! aboutTor.donationBanner.heart=Tor est au cœur de la liberté sur Internet aboutTor.donationBanner.tagline1=Des millions de personnes dépendent de Tor pour leur sécurité et la protection de leurs renseignements personnels en ligne aboutTor.donationBanner.tagline2=Un réseau de personnes qui protège les gens diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 1d21641..a678e98 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -95,10 +95,7 @@ height: 50px; letter-spacing: -0.00em; opacity: 100%; - padding-bottom: 5px; - padding-left: 5px; - padding-right: 5px; - padding-top: 5px; + padding: 10px; width: 100px; } #banner-donate-button-container:hover { @@ -115,7 +112,7 @@ font-size: 12px; font-weight: bold; height: 100%; - text-align: center; + text-align: start; width: 100%; } #banner-donate-button-text { @@ -125,11 +122,6 @@ justify-content: center; flex: 2 2 67%; } -#banner-donate-button-arrow { - flex: 1 1 33%; - font-size: 24px; - line-height: 24px; -} #banner-donate-button-link { flex: 0 0 auto; text-decoration: none;

1 0

[tor/master] Spell MAC_OS_X_VERSION_10_12 correctly.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit ef53526b104675cadb0e52dd3d9d407d1d027073 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:17:14 2016 -0500 Spell MAC_OS_X_VERSION_10_12 correctly. Fixes 20935. --- changes/bug20935 | 3 +++ configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug20935 b/changes/bug20935 new file mode 100644 index 0000000..78068c7 --- /dev/null +++ b/changes/bug20935 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac + Fixes bug 20935; bugfix on 0.2.9.6-rc. diff --git a/configure.ac b/configure.ac index df68ffa..699eafc 100644 --- a/configure.ac +++ b/configure.ac @@ -430,11 +430,11 @@ AC_MSG_CHECKING([for a pre-Sierra OSX build target]) AC_TRY_COMPILE([ #ifdef __APPLE__ # include <AvailabilityMacros.h> -# ifndef MAC_OS_VERSION_10_12 -# define MAC_OS_VERSION_10_12 101200 +# ifndef MAC_OS_X_VERSION_10_12 +# define MAC_OS_X_VERSION_10_12 101200 # endif # if defined(MAC_OS_X_VERSION_MIN_REQUIRED) -# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_10_12 +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 # error "Running on Mac OSX 10.11 or earlier" # endif # endif

1 0

[tor/maint-0.2.9] Spell MAC_OS_X_VERSION_10_12 correctly.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit ef53526b104675cadb0e52dd3d9d407d1d027073 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:17:14 2016 -0500 Spell MAC_OS_X_VERSION_10_12 correctly. Fixes 20935. --- changes/bug20935 | 3 +++ configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug20935 b/changes/bug20935 new file mode 100644 index 0000000..78068c7 --- /dev/null +++ b/changes/bug20935 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac + Fixes bug 20935; bugfix on 0.2.9.6-rc. diff --git a/configure.ac b/configure.ac index df68ffa..699eafc 100644 --- a/configure.ac +++ b/configure.ac @@ -430,11 +430,11 @@ AC_MSG_CHECKING([for a pre-Sierra OSX build target]) AC_TRY_COMPILE([ #ifdef __APPLE__ # include <AvailabilityMacros.h> -# ifndef MAC_OS_VERSION_10_12 -# define MAC_OS_VERSION_10_12 101200 +# ifndef MAC_OS_X_VERSION_10_12 +# define MAC_OS_X_VERSION_10_12 101200 # endif # if defined(MAC_OS_X_VERSION_MIN_REQUIRED) -# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_10_12 +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 # error "Running on Mac OSX 10.11 or earlier" # endif # endif

1 0

[tor/master] Remove changes files from master that are already in 0297-rc
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 936ce997bb081a76823885fc11c3f55679800f82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:24:37 2016 -0500 Remove changes files from master that are already in 0297-rc --- changes/19974 | 5 ----- changes/20492 | 4 ---- changes/bug19960 | 4 ---- changes/bug20710_025 | 4 ---- changes/bug20715 | 4 ---- changes/bug20716 | 3 --- changes/bug20810 | 4 ---- changes/bug20864 | 4 ---- changes/bug20875 | 4 ---- changes/bug20935 | 3 --- changes/geoip-december2016 | 4 ---- 11 files changed, 43 deletions(-) diff --git a/changes/19974 b/changes/19974 deleted file mode 100644 index 5496143..0000000 --- a/changes/19974 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (unit tests): - - Fix tolerances in unit tests for monotonic time comparisons between - nanoseconds and microseconds. Previously, we accepted a 10 us - difference only, which is not realistic on every platform's - clock_gettime(). Fixes bug 19974; bugfix on 0.2.9.1-alpha. diff --git a/changes/20492 b/changes/20492 deleted file mode 100644 index fdcd4d0..0000000 --- a/changes/20492 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfix (build): - - The current Git revision when building from a local repository is now - detected correctly when using git worktrees. Fixes bug 20492; bugfix on - 0.2.3.9-alpha. diff --git a/changes/bug19960 b/changes/bug19960 deleted file mode 100644 index 5d65585..0000000 --- a/changes/bug19960 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (netbsd, unit tests): - - Stop expecting NetBSD unit tests to report success for ipfw; - on NetBSD, it's only pf that's supported. - Part of a fix for bug 19960; bugfix on 0.2.9.5-alpha. diff --git a/changes/bug20710_025 b/changes/bug20710_025 deleted file mode 100644 index 12bd075..0000000 --- a/changes/bug20710_025 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (memory leak, use-after-free, linux seccomp2 sandbox): - - Fix a memory leak and use-after-free error when removing entries - from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on - 0.2.5.5-alpha. Patch from "cypherpunks". diff --git a/changes/bug20715 b/changes/bug20715 deleted file mode 100644 index 737a560..0000000 --- a/changes/bug20715 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (memory leak) - - When moving a signed descriptor object from a source to an existing - destination, free the allocated memory inside that destination object. - Bugfix on tor-0.2.8.3-alpha; Closes #20715. diff --git a/changes/bug20716 b/changes/bug20716 deleted file mode 100644 index 37fd6fe..0000000 --- a/changes/bug20716 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (client, memory leak): - - Fix a small memory leak when receiving AF_UNIX connections on - a SocksPort. Fixes bug 20716; bugfix on 0.2.6.3-alpha. diff --git a/changes/bug20810 b/changes/bug20810 deleted file mode 100644 index 5420a73..0000000 --- a/changes/bug20810 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (relay) - - When computing old Tor protocol line version in protover, we were - looking at 0.2.7.5 twice instead of a specific case for 0.2.9.1-alpha. - Bugfix on tor-0.2.9.4-alpha. diff --git a/changes/bug20864 b/changes/bug20864 deleted file mode 100644 index 7b8c70f..0000000 --- a/changes/bug20864 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (unit tests, hidden services): - - Remove a double-free in the single onion service unit test. Stop - ignoring a return value. Make future changes less error-prone. - Fixes bug 20864; bugfix on 0.2.9.6-rc. diff --git a/changes/bug20875 b/changes/bug20875 deleted file mode 100644 index 6bba2cb..0000000 --- a/changes/bug20875 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (download scheduling) - - Resolve a "bug" warning when considering a download schedule whose - delay had approached INT_MAX. Fixes 20875; bugfix on 0.2.9.5-alpha. - diff --git a/changes/bug20935 b/changes/bug20935 deleted file mode 100644 index 78068c7..0000000 --- a/changes/bug20935 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (portability): - - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac - Fixes bug 20935; bugfix on 0.2.9.6-rc. diff --git a/changes/geoip-december2016 b/changes/geoip-december2016 deleted file mode 100644 index 60754ea..0000000 --- a/changes/geoip-december2016 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features: - - Update geoip and geoip6 to the December 7 2016 Maxmind GeoLite2 - Country database. -

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit cbdb3c92f58c4ab1f80542d8e2c1b54557db29dc Merge: 14edb0b ef53526 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:23:31 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20935 | 3 +++ configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit c80b7186bcd0b7759c8660c42b05556b45e67711 Merge: 863538a ef53526 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:22:35 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug20935 | 3 +++ configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Spell MAC_OS_X_VERSION_10_12 correctly.
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit ef53526b104675cadb0e52dd3d9d407d1d027073 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:17:14 2016 -0500 Spell MAC_OS_X_VERSION_10_12 correctly. Fixes 20935. --- changes/bug20935 | 3 +++ configure.ac | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug20935 b/changes/bug20935 new file mode 100644 index 0000000..78068c7 --- /dev/null +++ b/changes/bug20935 @@ -0,0 +1,3 @@ + o Minor bugfixes (portability): + - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac + Fixes bug 20935; bugfix on 0.2.9.6-rc. diff --git a/configure.ac b/configure.ac index df68ffa..699eafc 100644 --- a/configure.ac +++ b/configure.ac @@ -430,11 +430,11 @@ AC_MSG_CHECKING([for a pre-Sierra OSX build target]) AC_TRY_COMPILE([ #ifdef __APPLE__ # include <AvailabilityMacros.h> -# ifndef MAC_OS_VERSION_10_12 -# define MAC_OS_VERSION_10_12 101200 +# ifndef MAC_OS_X_VERSION_10_12 +# define MAC_OS_X_VERSION_10_12 101200 # endif # if defined(MAC_OS_X_VERSION_MIN_REQUIRED) -# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_10_12 +# if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_12 # error "Running on Mac OSX 10.11 or earlier" # endif # endif

1 0

[tor/release-0.2.9] fold 20935 into 0.2.9.7-rc changelog
by nickm＠torproject.org 12 Dec '16

12 Dec '16

commit 6b6ad81c2e140d8521307ff838f9068340e244f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 11 22:23:26 2016 -0500 fold 20935 into 0.2.9.7-rc changelog --- ChangeLog | 4 ++++ changes/bug20935 | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c361a29..5671e0c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,10 @@ Changes in version 0.2.9.7-rc - 2016-12-12 from the sandbox's getaddrinfo() cache. Fixes bug 20710; bugfix on 0.2.5.5-alpha. Patch from "cypherpunks". + o Minor bugfixes (portability): + - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac + Fixes bug 20935; bugfix on 0.2.9.6-rc. + o Minor bugfixes (unit tests): - Stop expecting NetBSD unit tests to report success for ipfw. Part of a fix for bug 19960; bugfix on 0.2.9.5-alpha. diff --git a/changes/bug20935 b/changes/bug20935 deleted file mode 100644 index 78068c7..0000000 --- a/changes/bug20935 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (portability): - - Use the correct spelling of MAC_OS_X_VERSION_10_12 on configure.ac - Fixes bug 20935; bugfix on 0.2.9.6-rc.

1 0