March 2019 - tor-commits - lists.torproject.org

[tpo/staging] Fix layout
by hiro＠torproject.org 07 Mar '19

07 Mar '19

commit 747d36b5280a99827aa52a1a4089ff84fbfd41f0 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 7 12:18:07 2019 +0100 Fix layout --- templates/macros/people.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/macros/people.html b/templates/macros/people.html index 48c23b6..22b0121 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -1,5 +1,5 @@ {% macro render_board(item, alternative) %} - <div class="col-md-4 col-xl-3 my-4"> + <div class="col-md-6 col-sm-12 col-xl-3 my-4"> <div class="card h-100 my-2"> <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> @@ -12,7 +12,7 @@ {% endmacro %} {% macro render_core(item, alternative) %} - <div class="col-md-3 col-xl-2 my-3"> + <div class="col-md-6 col-sm-12 col-xl-3 my-3"> <div class="card h-100"> <div class="card-header bg-white border-0"> {% if item.image %}

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 07 Mar '19

07 Mar '19

commit 78e225eec23fe26b06476a8b0bb4d83e63cfd2a4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 09:19:54 2019 +0000 Update translations for tpo-web --- contents+es.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contents+es.po b/contents+es.po index dc0a90924..e09b3f61c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2213,10 +2213,9 @@ msgid "" "setup process. Select <span class=\"text-primary\">\"Tor is censored in my " "country.\"</span>" msgstr "" -"If you are in a country where Tor is blocked, you can <a " -"link=\"http://somenastylink.com\" class=\"text-primary text-" -"bold\">configure</span> Tor to connect to a bridge during the setup process." -" Select <span class=\"text-primary\">\"Tor is censored in my " +"If you are in a country where Tor is blocked, you can <span class=\"text-" +"primary text-bold\">configure</span> Tor to connect to a bridge during the " +"setup process. Select <span class=\"text-primary\">\"Tor is censored in my " "country.\"</span>" #: templates/download.html:12

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 07 Mar '19

07 Mar '19

commit 67b7772314a4f67ce7bc099ddea739d92622cd84 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 7 08:49:50 2019 +0000 Update translations for tpo-web --- contents+es.po | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contents+es.po b/contents+es.po index 15a3b48dd..dc0a90924 100644 --- a/contents+es.po +++ b/contents+es.po @@ -2213,6 +2213,11 @@ msgid "" "setup process. Select <span class=\"text-primary\">\"Tor is censored in my " "country.\"</span>" msgstr "" +"If you are in a country where Tor is blocked, you can <a " +"link=\"http://somenastylink.com\" class=\"text-primary text-" +"bold\">configure</span> Tor to connect to a bridge during the setup process." +" Select <span class=\"text-primary\">\"Tor is censored in my " +"country.\"</span>" #: templates/download.html:12 msgid ""

1 0

[tpo/staging] https links
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit ebf0dadb7bf73a3606811b1bfcd657ec94d8c770 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 7 08:58:23 2019 +0100 https links --- content/about/sponsors/google/contents.lr | 2 +- content/about/sponsors/shinjiru/contents.lr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/google/contents.lr b/content/about/sponsors/google/contents.lr index 6b0483b..6d2aa90 100644 --- a/content/about/sponsors/google/contents.lr +++ b/content/about/sponsors/google/contents.lr @@ -6,4 +6,4 @@ time: 2008 - 2009 --- name: Google --- -link: http://code.google.com/opensource/ +link: https://code.google.com/opensource/ diff --git a/content/about/sponsors/shinjiru/contents.lr b/content/about/sponsors/shinjiru/contents.lr index 3a5542b..ec819eb 100644 --- a/content/about/sponsors/shinjiru/contents.lr +++ b/content/about/sponsors/shinjiru/contents.lr @@ -6,4 +6,4 @@ time: 2009 - 2011 --- name: Shinjiru Technology --- -link: http://www.shinjiru.com/ +link: https://www.shinjiru.com/

1 0

[tpo/staging] take html link out, and replace it with https link
by emmapeel＠torproject.org 07 Mar '19

07 Mar '19

commit 7591d2f5108220754f37c14647f3defebaefecb5 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 7 08:27:27 2019 +0100 take html link out, and replace it with https link --- content/about/people/ssteele/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/people/ssteele/contents.lr b/content/about/people/ssteele/contents.lr index 6ce2b87..a31299e 100644 --- a/content/about/people/ssteele/contents.lr +++ b/content/about/people/ssteele/contents.lr @@ -12,4 +12,4 @@ description: Shari Steele was the Executive Director of the Tor Project from December 2015 through December 2018. She came to Tor after serving as Executive Director of the Electronic Frontier Foundation (EFF) for 15 years. From 1992 to 2000, Shari worked as an attorney and then legal director at EFF, where she spoke widely about civil liberties law in newly emerging technologies. -A graduate of Widener University School of Law, Shari later served as a teaching fellow at Georgetown University Law Center <http://www.law.georgetown.edu/>, where she earned an LL.M. degree in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor Project Board of Directors since January 2019. +A graduate of Widener University School of Law, Shari later served as a teaching fellow at [Georgetown University Law Center](https://www.law.georgetown.edu/), where she earned an LL.M. degree in Advocacy. Shari has been on EFF’s Board of Directors since 2000 and the Tor Project Board of Directors since January 2019.

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 06 Mar '19

06 Mar '19

commit 5c78bd32246fb4c3cb966474b135ddb2dc1ad57f Merge: ea1de8443 9b4ecbaa7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 6 14:29:45 2019 -0500 Merge branch 'maint-0.4.0' into release-0.4.0 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.4' into maint-0.3.5
by nickm＠torproject.org 06 Mar '19

06 Mar '19

commit d6f77b99dac1a368514cfcfc1d6c5908ef6dd74a Merge: 1c248fa27 155b0f552 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 6 14:29:38 2019 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 06 Mar '19

06 Mar '19

commit 9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b Merge: a999cb43d d6f77b99d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 6 14:29:43 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.2.9' into maint-0.3.3
by nickm＠torproject.org 06 Mar '19

06 Mar '19

commit 0c9cd7c487ac75d9505f46e5ff42087d383eb1b4 Merge: 76b55fde8 2e74edb53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 6 14:29:29 2019 -0500 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 06 Mar '19

06 Mar '19

commit 155b0f5521b12c17d7e5b500c6aa7ed20fcacc12 Merge: f56645917 0c9cd7c48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 6 14:29:33 2019 -0500 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/geoip-2019-03-04 | 4 + src/config/geoip | 12163 ++++++++++++++++++++++++--------------------- src/config/geoip6 | 2251 ++++++--- 3 files changed, 8221 insertions(+), 6197 deletions(-)

1 0