November 2018 - tor-commits - lists.torproject.org

[webwml/staging] Fix merge conflicts
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 216b3d1b7ab1f7c138d8018f96dbfdfa3f0ef7a3 Merge: ceae9fa8 21c524ed Author: hiro <hiro(a)torproject.org> Date: Mon Nov 5 13:53:52 2018 +0100 Fix merge conflicts css/layout.css | 25 ++++++++++++++++--------- css/layout.min.css | 9 +++------ 2 files changed, 19 insertions(+), 15 deletions(-)

1 0

[webwml/staging] Change banner
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 8c0b5afcd9d0c276a6cda3b80115e7e5ecf86b83 Author: hiro <hiro(a)torproject.org> Date: Sat Nov 3 16:21:35 2018 +0100 Change banner --- css/layout.css | 13 +++++++++++++ css/layout.min.css | 36 ++++++++++++++++++++++++++++++++++++ en/banner.wmi | 2 +- en/banner2.wmi | 16 ++++++++++++++++ en/index.wml | 2 +- 5 files changed, 67 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index 55ae4eae..5aac6576 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1493,3 +1493,16 @@ p.blogDate { mark { background: cyan; } + +.eoy-background-2 { + background-color: #000000; + width: 100%; + height: 300px; + margin-bottom: 35px; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; +} diff --git a/css/layout.min.css b/css/layout.min.css index f45df9d1..dfc549e4 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -93,8 +93,44 @@ font-weight: 600; line-height: 17px; text-align: center; + text-decoration: none; } mark { background: cyan; } + +.eoy-background-2 { + background-color: #000000; + width: 100%; + height: 300px; + margin-bottom: 35px; + text-align: center; +} + +.green { + color: green; +} + +.white { + color: white; +} + +.bggreen { + background-color: green; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; + text-align: center; +} + +.align-center { + text-align: center; + width: 100%; + align-content: center; + font-size-adjust: 1; + line-height: 3em; +} diff --git a/en/banner.wmi b/en/banner.wmi index bb914cc8..35c13e7c 100644 --- a/en/banner.wmi +++ b/en/banner.wmi @@ -4,7 +4,7 @@ </div> <div class="eoy-message"> <div class="tor-strength-in-num"> - <p>Tor: strength in numbers</p> + <p>Tor: Strength in numbers</p> </div> <div class="keep-tor-strong-giv"> <p class="advance-universal-hu">Advance universal <mark>human rights.</mark> Protect the <mark>privacy of millions.</mark> Your financial support will allow people around the world to be more <mark>safe online.</mark></p> diff --git a/en/banner2.wmi b/en/banner2.wmi new file mode 100644 index 00000000..3504994b --- /dev/null +++ b/en/banner2.wmi @@ -0,0 +1,16 @@ +<div class="eoy-background-2 align-center"> + <div class="eoy-wrap align-center"> + <div class="eoy-message-2 align-center"> + <div class="tor-strength-in-num green align-center"> + <p>Tor: Strength in numbers</p> + </div> + <div class="keep-tor-strong-giv align-center"> + <p class="advance-universal-hu white align-center">Keep Tor <mark class="bggreen">Strong</mark></p> + <span class="give-today-and-mozi white">Give today, and Mozilla will match your donation.</span> + </div> + <div class="eoy-btn-container align-center"> + <a class="eoy-btn count-me-in bggreen" href="https://torproject.org/donate/donate-sin-hp1">Donate now</a> + </div> + </div> + </div> +</div> diff --git a/en/index.wml b/en/index.wml index 68003e49..f99eeed5 100644 --- a/en/index.wml +++ b/en/index.wml @@ -1,7 +1,7 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 1-high -#include "banner.wmi" +#include "banner2.wmi" #include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <div id="home"> <div id="content" class="clearfix">

1 0

[webwml/staging] Remove space on bottom of banner
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 44f3d9e08ae6560e2ec04a1a33ca0732a05aa6fc Author: hiro <hiro(a)torproject.org> Date: Mon Nov 5 15:55:53 2018 +0100 Remove space on bottom of banner --- css/layout.css | 22 +++++++++++++++++++++- css/layout.min.css | 3 ++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index aac7740f..3d6453c2 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1495,7 +1495,7 @@ mark { .eoy-background-2 { background-color: #000000; width: 100%; - height: 300px; + height: 240px; margin-bottom: 35px; } @@ -1506,6 +1506,26 @@ mark { text-align: center; } +.green { + color: green; +} + +.white { + color: white; +} + +.bggreen { + background-color: green; + color: white; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; + text-align: center; +} + .align-center { text-align: center; width: 100%; diff --git a/css/layout.min.css b/css/layout.min.css index 79b84d16..17969bb5 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -100,7 +100,7 @@ mark { .eoy-background-2 { background-color: #000000; width: 100%; - height: 300px; + height: 240px; margin-bottom: 35px; text-align: center; } @@ -115,6 +115,7 @@ mark { .bggreen { background-color: green; + color: white; } .eoy-message-2 {

1 0

[webwml/master] Remove space on bottom of banner
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 44f3d9e08ae6560e2ec04a1a33ca0732a05aa6fc Author: hiro <hiro(a)torproject.org> Date: Mon Nov 5 15:55:53 2018 +0100 Remove space on bottom of banner --- css/layout.css | 22 +++++++++++++++++++++- css/layout.min.css | 3 ++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index aac7740f..3d6453c2 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1495,7 +1495,7 @@ mark { .eoy-background-2 { background-color: #000000; width: 100%; - height: 300px; + height: 240px; margin-bottom: 35px; } @@ -1506,6 +1506,26 @@ mark { text-align: center; } +.green { + color: green; +} + +.white { + color: white; +} + +.bggreen { + background-color: green; + color: white; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; + text-align: center; +} + .align-center { text-align: center; width: 100%; diff --git a/css/layout.min.css b/css/layout.min.css index 79b84d16..17969bb5 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -100,7 +100,7 @@ mark { .eoy-background-2 { background-color: #000000; width: 100%; - height: 300px; + height: 240px; margin-bottom: 35px; text-align: center; } @@ -115,6 +115,7 @@ mark { .bggreen { background-color: green; + color: white; } .eoy-message-2 {

1 0

[tor-browser-build/master] Bug 28310: don't build obfs4 with module versioning support
by gk＠torproject.org 05 Nov '18

05 Nov '18

commit 2e468e7b9b13cec82bd8034925433a7fd394a97d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 5 11:26:06 2018 +0100 Bug 28310: don't build obfs4 with module versioning support --- projects/obfs4/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/obfs4/build b/projects/obfs4/build index 287704a..2c3f933 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -16,6 +16,12 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +[% IF c("var/nightly") -%] + # Remove go.mod and go.sum files until we can build using Go module + # versioning (see bug 28325). + rm -f go.mod go.sum +[% END -%] + mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy

1 0

[webwml/master] Fix banner padding
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 21c524edf09e0b4a7151ffd768bcbd11461498b1 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 5 13:52:27 2018 +0100 Fix banner padding --- css/layout.css | 5 +---- css/layout.min.css | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/css/layout.css b/css/layout.css index e15fcaf9..77c4a243 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1466,10 +1466,7 @@ p.blogDate { font-size: 60%; } -.eoy-btn-container{ - padding-top: 5%; - padding-bottom: 5%; -} +.eoy-btn-container{ padding: 3% 0;} .eoy-btn { background-color: #420C5D; diff --git a/css/layout.min.css b/css/layout.min.css index 70e710c9..79b84d16 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -71,10 +71,7 @@ font-size: 60%; } -.eoy-btn-container{ - padding-top: 5%; - padding-bottom: 5%; -} +.eoy-btn-container{ padding: 3% 0;} .eoy-btn { background-color: #420C5D;

1 0

[webwml/master] Change banner
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 8c0b5afcd9d0c276a6cda3b80115e7e5ecf86b83 Author: hiro <hiro(a)torproject.org> Date: Sat Nov 3 16:21:35 2018 +0100 Change banner --- css/layout.css | 13 +++++++++++++ css/layout.min.css | 36 ++++++++++++++++++++++++++++++++++++ en/banner.wmi | 2 +- en/banner2.wmi | 16 ++++++++++++++++ en/index.wml | 2 +- 5 files changed, 67 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index 55ae4eae..5aac6576 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1493,3 +1493,16 @@ p.blogDate { mark { background: cyan; } + +.eoy-background-2 { + background-color: #000000; + width: 100%; + height: 300px; + margin-bottom: 35px; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; +} diff --git a/css/layout.min.css b/css/layout.min.css index f45df9d1..dfc549e4 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -93,8 +93,44 @@ font-weight: 600; line-height: 17px; text-align: center; + text-decoration: none; } mark { background: cyan; } + +.eoy-background-2 { + background-color: #000000; + width: 100%; + height: 300px; + margin-bottom: 35px; + text-align: center; +} + +.green { + color: green; +} + +.white { + color: white; +} + +.bggreen { + background-color: green; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; + text-align: center; +} + +.align-center { + text-align: center; + width: 100%; + align-content: center; + font-size-adjust: 1; + line-height: 3em; +} diff --git a/en/banner.wmi b/en/banner.wmi index bb914cc8..35c13e7c 100644 --- a/en/banner.wmi +++ b/en/banner.wmi @@ -4,7 +4,7 @@ </div> <div class="eoy-message"> <div class="tor-strength-in-num"> - <p>Tor: strength in numbers</p> + <p>Tor: Strength in numbers</p> </div> <div class="keep-tor-strong-giv"> <p class="advance-universal-hu">Advance universal <mark>human rights.</mark> Protect the <mark>privacy of millions.</mark> Your financial support will allow people around the world to be more <mark>safe online.</mark></p> diff --git a/en/banner2.wmi b/en/banner2.wmi new file mode 100644 index 00000000..3504994b --- /dev/null +++ b/en/banner2.wmi @@ -0,0 +1,16 @@ +<div class="eoy-background-2 align-center"> + <div class="eoy-wrap align-center"> + <div class="eoy-message-2 align-center"> + <div class="tor-strength-in-num green align-center"> + <p>Tor: Strength in numbers</p> + </div> + <div class="keep-tor-strong-giv align-center"> + <p class="advance-universal-hu white align-center">Keep Tor <mark class="bggreen">Strong</mark></p> + <span class="give-today-and-mozi white">Give today, and Mozilla will match your donation.</span> + </div> + <div class="eoy-btn-container align-center"> + <a class="eoy-btn count-me-in bggreen" href="https://torproject.org/donate/donate-sin-hp1">Donate now</a> + </div> + </div> + </div> +</div> diff --git a/en/index.wml b/en/index.wml index 68003e49..f99eeed5 100644 --- a/en/index.wml +++ b/en/index.wml @@ -1,7 +1,7 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 1-high -#include "banner.wmi" +#include "banner2.wmi" #include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <div id="home"> <div id="content" class="clearfix">

1 0

[webwml/master] Add banner2 to spanish
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 0c28e5961aea321b614e3eb913fa2083746724ca Author: hiro <hiro(a)torproject.org> Date: Sat Nov 3 16:22:16 2018 +0100 Add banner2 to spanish --- es/banner2.wmi | 16 ++++++++++++++++ es/index.wml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/es/banner2.wmi b/es/banner2.wmi new file mode 100644 index 00000000..3504994b --- /dev/null +++ b/es/banner2.wmi @@ -0,0 +1,16 @@ +<div class="eoy-background-2 align-center"> + <div class="eoy-wrap align-center"> + <div class="eoy-message-2 align-center"> + <div class="tor-strength-in-num green align-center"> + <p>Tor: Strength in numbers</p> + </div> + <div class="keep-tor-strong-giv align-center"> + <p class="advance-universal-hu white align-center">Keep Tor <mark class="bggreen">Strong</mark></p> + <span class="give-today-and-mozi white">Give today, and Mozilla will match your donation.</span> + </div> + <div class="eoy-btn-container align-center"> + <a class="eoy-btn count-me-in bggreen" href="https://torproject.org/donate/donate-sin-hp1">Donate now</a> + </div> + </div> + </div> +</div> diff --git a/es/index.wml b/es/index.wml index 7ae08d27..a720b87c 100644 --- a/es/index.wml +++ b/es/index.wml @@ -1,7 +1,7 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 1-high -#include "banner.wmi" +#include "banner2.wmi" #include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <define-tag lang>es-ES</define-tag> <div id="home">

1 0

[webwml/master] Fix font-size and line eight for banner
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit af8580b89aa2ccbd3042475ab9a16904e15cda8f Author: hiro <hiro(a)torproject.org> Date: Mon Nov 5 13:32:30 2018 +0100 Fix font-size and line eight for banner --- css/layout.css | 33 ++++++++++++++++++++++++++++----- css/layout.min.css | 4 ++-- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/css/layout.css b/css/layout.css index 5aac6576..e15fcaf9 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1399,7 +1399,7 @@ p.blogDate { background-color: #F8F9FA; width: 100%; height: 300px; - margin-bottom: 35px; + margin-bottom: 35px; } .eoy-wrap { @@ -1417,7 +1417,7 @@ p.blogDate { } .eoy-message { - width: 55%; + width: 55%; float: right; padding-left: 35px; } @@ -1449,7 +1449,7 @@ p.blogDate { text-align: left; } -.tor-strength-in-num > p.title { +.tor-strength-in-num > p { text-transform: uppercase; } @@ -1477,8 +1477,8 @@ p.blogDate { width: 120px; height: 35px; padding: 10px; - padding-left: 20px; - padding-right: 20px; + padding-left: 20px; + padding-right: 20px; } .count-me-in { @@ -1488,6 +1488,7 @@ p.blogDate { font-weight: 600; line-height: 17px; text-align: center; + text-decoration: none; } mark { @@ -1499,10 +1500,32 @@ mark { width: 100%; height: 300px; margin-bottom: 35px; + text-align: center; +} + +.green { + color: green; +} + +.white { + color: white; +} + +.bggreen { + background-color: green; } .eoy-message-2 { width: 90%; margin:auto; padding:auto; + text-align: center; +} + +.align-center { + text-align: center; + width: 100%; + align-content: center; + font-size-adjust: 0.7; + line-height: 1.5em; } diff --git a/css/layout.min.css b/css/layout.min.css index dfc549e4..70e710c9 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -131,6 +131,6 @@ mark { text-align: center; width: 100%; align-content: center; - font-size-adjust: 1; - line-height: 3em; + font-size-adjust: 0.7; + line-height: 1.5em; }

1 0

[webwml/master] Change banner
by hiro＠torproject.org 05 Nov '18

05 Nov '18

commit 1ead898d41d94f142cad6082dc6e3136deba14e3 Author: hiro <hiro(a)torproject.org> Date: Sat Nov 3 16:21:35 2018 +0100 Change banner --- css/layout.css | 13 +++++++++++++ css/layout.min.css | 36 ++++++++++++++++++++++++++++++++++++ en/banner.wmi | 2 +- en/banner2.wmi | 16 ++++++++++++++++ en/index.wml | 2 +- 5 files changed, 67 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index 55ae4eae..5aac6576 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1493,3 +1493,16 @@ p.blogDate { mark { background: cyan; } + +.eoy-background-2 { + background-color: #000000; + width: 100%; + height: 300px; + margin-bottom: 35px; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; +} diff --git a/css/layout.min.css b/css/layout.min.css index f45df9d1..dfc549e4 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -93,8 +93,44 @@ font-weight: 600; line-height: 17px; text-align: center; + text-decoration: none; } mark { background: cyan; } + +.eoy-background-2 { + background-color: #000000; + width: 100%; + height: 300px; + margin-bottom: 35px; + text-align: center; +} + +.green { + color: green; +} + +.white { + color: white; +} + +.bggreen { + background-color: green; +} + +.eoy-message-2 { + width: 90%; + margin:auto; + padding:auto; + text-align: center; +} + +.align-center { + text-align: center; + width: 100%; + align-content: center; + font-size-adjust: 1; + line-height: 3em; +} diff --git a/en/banner.wmi b/en/banner.wmi index bb914cc8..35c13e7c 100644 --- a/en/banner.wmi +++ b/en/banner.wmi @@ -4,7 +4,7 @@ </div> <div class="eoy-message"> <div class="tor-strength-in-num"> - <p>Tor: strength in numbers</p> + <p>Tor: Strength in numbers</p> </div> <div class="keep-tor-strong-giv"> <p class="advance-universal-hu">Advance universal <mark>human rights.</mark> Protect the <mark>privacy of millions.</mark> Your financial support will allow people around the world to be more <mark>safe online.</mark></p> diff --git a/en/banner2.wmi b/en/banner2.wmi new file mode 100644 index 00000000..3504994b --- /dev/null +++ b/en/banner2.wmi @@ -0,0 +1,16 @@ +<div class="eoy-background-2 align-center"> + <div class="eoy-wrap align-center"> + <div class="eoy-message-2 align-center"> + <div class="tor-strength-in-num green align-center"> + <p>Tor: Strength in numbers</p> + </div> + <div class="keep-tor-strong-giv align-center"> + <p class="advance-universal-hu white align-center">Keep Tor <mark class="bggreen">Strong</mark></p> + <span class="give-today-and-mozi white">Give today, and Mozilla will match your donation.</span> + </div> + <div class="eoy-btn-container align-center"> + <a class="eoy-btn count-me-in bggreen" href="https://torproject.org/donate/donate-sin-hp1">Donate now</a> + </div> + </div> + </div> +</div> diff --git a/en/index.wml b/en/index.wml index 68003e49..f99eeed5 100644 --- a/en/index.wml +++ b/en/index.wml @@ -1,7 +1,7 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 1-high -#include "banner.wmi" +#include "banner2.wmi" #include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <div id="home"> <div id="content" class="clearfix">

1 0