September 2020 - tor-commits - lists.torproject.org

[tpo/staging] Edit htaccess
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit c56147f2115367c10d1d08e6e44f2c2c5ef49685 Author: hiro <hiro(a)torproject.org> Date: Sun Sep 27 19:16:01 2020 +0200 Edit htaccess --- .htaccess | 293 +++++++++++--------------------------------------------------- 1 file changed, 50 insertions(+), 243 deletions(-) diff --git a/.htaccess b/.htaccess index 1f35b8f7..9f26ed62 100644 --- a/.htaccess +++ b/.htaccess @@ -70,10 +70,6 @@ RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L] # Press RewriteRule ^press/press(.*) /press [R=302,L] -# Donation campaign -# 2019 -RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L] - # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=302,L] @@ -100,12 +96,9 @@ RewriteRule ^eff/(.*) https://2019.www.torproject.org/eff/$1 [R=302,L] # Videos RewriteRule ^videos/(.*) https://2019.www.torproject.org/videos/$1 [R=302,L] - # Donation campaign # 2017 # Special-case the donate-options and amazon page so it doesn't get redirected -RewriteRule ^donate/donate-options(.*) https://2019.www.torproject.org/donate/donate-options$1 [END] -RewriteRule ^donate/donate-amazon(.*) https://2019.www.torproject.org/donate/donate-amazon$1 [END] RewriteRule ^donate/donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/donor-faq(.*) https://donate.torproject.org/donor-faq [R=302,L] RewriteRule ^donate/donor-privacy-policy(.*) https://donate.torproject.org/privacy-policy [R=302,L] @@ -121,239 +114,53 @@ RewriteRule ^donate-email(.*) https://donate.torproject.org/ [R=302,L] # 2020 RewriteRule ^donate/donate-usetor-bp1(.*) https://donate.torproject.org/ [R=302,L] RewriteRule ^donate/donate-usetor-twitter-en(.*) https://donate.torproject.org/ [R=302,L] -Clicked on a tweet generated by the thank you page tweet intent button -donate.torproject.org - - -/donate/donate-ann-usetor-tw -Twitter -donate.torproject.org - - -/donate/donate-ann-usetor-tw-en -Twitter announcement -donate.torproject.org - - -/donate/donate-ann-usetor-fb -Facebook announcement -donate.torproject.org - - -/donate/donate-usetor-blog -generic blog post -donate.torproject.org - - -/donate/donate-hrd-usetor-tw -blog post HR Day twitter -donate.torproject.org - - -/donate/donate-usetor-hp1 -torproject.org homepage banner -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-fb -Facebook posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-md -Mastodon posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-tw -Twitter posts -donate.torproject.org - - -/donate/donate-twitter -Twitter -donate.torproject.org - - -https://torproject.org/donate/donate-usertor-ld -LinkedIn posts -donate.torproject.org - - -https://torproject.org/donate/donate-usetor-ig -Instagram posts -donate.torproject.org - - -/donate/donate-usetor-tn1 -Tor Newsletter -donate.torproject.org - - -/donate/donate-usetor-yt -YouTube posts -donate.torproject.org - - -/donate/donate-usetor-em1 -Announcement email -donate.torproject.org - - -/donate/donate-usetor-gp -Google Play -donate.torproject.org - -/donate/en -En locale -donate.torproject.org - - -/donate/ru -Ru locale -donate.torproject.org - - -/donate/es -Es locale -donate.torproject.org/es - - -/donate/donate.html -- -donate.torproject.org - - -/donate/donate-download.html.en -- -donate.torproject.org - - -/donate/donate.html.en -- -donate.torproject.org - - -/donate/donate-amazon.html.en -- -donate.torproject.org - - -/donate/donate-button.html.en -- -donate.torproject.org - - -/donate/donate-foot.html.en -- -donate.torproject.org - - -/donate/donate-options.html.en -- -donate.torproject.org - - -/donate/donate-download.html -- -donate.torproject.org - - -/donate/ -- -donate.torproject.org - - -/donate/donate-button.html -- -donate.torproject.org - -/donate/donate-usetor-en-US -about:tor donate button (english) (TBB) - - -/donate/donate-usetor-ru -about:tor donate button (Russian) (TBB) - - -/donate/donate-usetor-de -about:tor donate button (German) (TBB) - - -/donate/donate-usetor-fr -about:tor donate button (French) (TBB) - - -/donate/donate-usetor-zh-CN -about:tor donate button (Cantonese) (TBB) - - -/donate/donate-usetor-es-ES -about:tor donate button (Spanish) (TBB) - - -/donate/donate-usetor-ja -about:tor donate button (Japanese) (TBB) - - -/donate/donate-usetor-it -about:tor donate button (Italian) (TBB) - - -/donate/donate-usetor-pt-BR -about:tor donate button (Portuguese) (TBB) - - -/donate/donate-usetor-tr -about:tor donate button (Turkish) (TBB) - - -/donate/donate-usetor-ar -about:tor donate button (Arabic) (TBB) - - -/donate/donate-usetor-pl -about:tor donate button (Polish) (TBB) - - -/donate/donate-usetor-mobile-default -about:tor donate button (english) (TBA) - - -/donate/donate-usetor-mobile- -- - - -/donate/donate-tba-tb2/donate/donate-usetor-mobile- -about:tor donate button (language2) (TBA) - - -/donate/donate-usetor-mobile-ru -about:tor donate button (language3) (TBA) - - -/donate/donate-tba-tb4 -about:tor donate button (language4) (TBA) - - -/donate/donate-tba-tb5 -about:tor donate button (language5) (TBA) - - -/donate/donate-tba-tb6 -about:tor donate button (language6) (TBA) - - -/donate/donate-tba-tb7 -about:tor donate button (language7) (TBA) - - -/donate/donate-tba-tb8 -about:tor donate button (language8) (TBA) - - -/donate/donate-tba-tb9 -about:tor donate button (language10) (TBA) - - -/donate/donate-tba-tb10 +RewriteRule ^donate/donate-ann-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-tw-en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-ann-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-blog(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-hrd-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-hp1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fb(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-md(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tw(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-twitter(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usertor-ld(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ig(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tn1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-yt(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-em1(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-gp(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/en(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/es(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-download(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-amazon(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-foot(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-options(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-button(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-en-US(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-de(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-fr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-zh-CN(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-es-ES(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ja(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-it(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pt-BR(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-tr(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-ar(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-pl(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-default(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb2/donate/donate-usetor-mobile-(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-usetor-mobile-ru(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb4(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb5(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb6(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb7(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb8(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb9(.*) https://donate.torproject.org/ [R=302,L] +RewriteRule ^donate/donate-tba-tb10(.*) https://donate.torproject.org/ [R=302,L]

1 0

[tpo/staging] Close https://gitlab.torproject.org/tpo/web/tpo/-/issues/100
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 63b1646e754a6a0d40c5eeeb409ecbc5f8c560b5 Author: Antonela <antonela(a)torproject.org> Date: Fri Sep 4 12:10:21 2020 +0000 Close https://gitlab.torproject.org/tpo/web/tpo/-/issues/100 --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 5502cd44..385a4c49 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -115,7 +115,7 @@ <p><a href="https://duckduckgo.com" title="DuckDuckGo" target="_blank">DuckDuckGo</a></p> </li> <li class="list-group-item px-0"> - <p><a href="https://insurgo.ca" title="Insurgo, Inc" target="_blank">Insurgo, Inc</a></p> + <p><a href="https://insurgo.ca" title="Insurgo, Inc" target="_blank">Insurgo</a></p> </li> </ul> </div>

1 0

[tpo/staging] Update templates/membership.html
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit af77d41b43be35d7a6135f9f4efa9c9330570053 Author: Antonela <antonela(a)torproject.org> Date: Wed Sep 2 19:05:03 2020 +0000 Update templates/membership.html --- templates/membership.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/membership.html b/templates/membership.html index 67a84daa..5502cd44 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -14,7 +14,7 @@ </div> <div class="col-sm-8"> <a class="h2 col-12 text-primary p-0" href="#shallot">Shallot Onion Member</a> - <p class="nick">≥ $100,000 per year year</p> + <p class="nick">≥ $100,000 per year</p> <p>Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.</p> </div> </div>

1 0

[tpo/staging] Update assets/static/images/membership/logos/avast.png, assets/static/images/membership/logos/cymru.png files
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 5b21212064a9635476b7030f1b7212353295e612 Author: Antonela <antonela(a)torproject.org> Date: Mon Aug 31 15:02:03 2020 +0000 Update assets/static/images/membership/logos/avast.png, assets/static/images/membership/logos/cymru.png files --- .../static/images/membership/logos/{Avast.png => avast.png} | Bin .../static/images/membership/logos/{Cymru.png => cymru.png} | Bin 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/membership/logos/Avast.png b/assets/static/images/membership/logos/avast.png similarity index 100% rename from assets/static/images/membership/logos/Avast.png rename to assets/static/images/membership/logos/avast.png diff --git a/assets/static/images/membership/logos/Cymru.png b/assets/static/images/membership/logos/cymru.png similarity index 100% rename from assets/static/images/membership/logos/Cymru.png rename to assets/static/images/membership/logos/cymru.png

1 0

[tpo/staging] Merge branch 'watch-privchat-2'
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 2f017dda4a8a02c402c9ce2d6049a82d50ea5bb3 Merge: 63b1646e 724d1914 Author: gus <gus(a)torproject.org> Date: Tue Sep 8 07:23:21 2020 -0400 Merge branch 'watch-privchat-2' templates/privchat.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tpo/staging] Update privchat.html
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 724d1914ce2b30dd9c4a46230497a32b4b36ef10 Author: Antonela <antonela(a)torproject.org> Date: Mon Sep 7 11:19:44 2020 +0000 Update privchat.html --- templates/privchat.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/privchat.html b/templates/privchat.html index d5de746e..ecb452c2 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -1,4 +1,3 @@ - <div class="container" style="background:url({{ '/static/images/privchat/pattern.png' }}) no-repeat center; background-size: contain;"> <div class="w-50 text-center mx-auto"> <img class="img-fluid p-3" height="auto" src="{{ '/static/images/privchat/privchat.svg' }}" /> <h1 class="display-2 text-primary">PrivChat</h1> @@ -27,7 +26,7 @@ <div> <p><span class="text-primary nick" style="font-size:18px;"><mark>August 28th ∙ 10:00 AM Pacific Time ∙ 17:00 UTC ∙ 13:00 Eastern Time ∙ <a href="https://youtu.be/aOOChyMCZH4" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> </div> - <a class="btn btn-small bg-primary text-light my-4" href="https://youtu.be/aOOChyMCZH4" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> + <a class="btn btn-small bg-primary text-light my-4" href="https://youtu.be/aOOChyMCZH4" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Watch") }} </a></p> <div> <p class="font-family-serif"> Every year, internet censorship increases globally. From network level blocking to nation-wide internet blackouts, governments and private companies have powerful tools to restrict information and hault connection between people. Many people, groups, and organizations are doing innovative work to study, measure, and fight back against internet censorship--and they are helping millions of people connect more regularly and safely to the internet. Despite these successes, we're faced with well-funded adversaries that have billions of dollars to spend on censorship mechanisms, and the arms race is ongoing. The second edition of PrivChat with Tor will be about the Good, the Bad and the Ugly that is happening in the front lines of censorship circumvention. In a world where censorship technology is increasingly sophisticated and bought and sold between nations, so is our creativity to measure it and build tools to bypass it, as well as the willingness of people to fight back. But is it enough? What are the barriers facing the people and organizations fighting for internet freedom?

1 0

[tpo/staging] Add new Tor Browser version 10.0a7
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 605452361c8120eff2afaceb60aa0d1a429d520f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Sep 16 21:57:44 2020 +0000 Add new Tor Browser version 10.0a7 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 57cd0ea3..d0a3a6ff 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -20,5 +20,9 @@ body: "10.0a6", "10.0a6-MacOS", "10.0a6-Linux", -"10.0a6-Windows" +"10.0a6-Windows", +"10.0a7", +"10.0a7-MacOS", +"10.0a7-Linux", +"10.0a7-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 751bec84..4cb55e68 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,7 +6,7 @@ win32 = 0.4.3.6 version = 9.5.4 [torbrowser-alpha] -version = 10.0a6 +version = 10.0a7 [torbrowser-android-alpha] version = 10.0a6

1 0

[tpo/staging] Update README instructions to GitLab
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 396885ed93ca8fe25f43e66ed6e773745a6a1919 Author: gus <gus(a)torproject.org> Date: Wed Sep 9 11:01:16 2020 -0400 Update README instructions to GitLab --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6a3d132e..407049d4 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/tpo.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/tpo/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Website. - +First, check if the bug is already known. You can search and read all the issues at https://gitlab.torproject.org/. To create a new issue, please [request a new account](https://gitlab.onionize.space/) to access Tor Project's GitLab instance and [find the right repository](https://gitlab.torproject.org/tpo) to report your issue. Issues related to our websites should be filed under the [Web issue tracker](https://gitlab.torproject.org/groups/tpo/web/-/issues). ## What is Lektor @@ -51,7 +50,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the…. +Check our [wiki pages](https://gitlab.torproject.org/web/community/wikis/How-to-develop-on-…. ### Translations

1 0

[tpo/staging] Add menu item
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit ad9962e2a3b4d8b2b43299c30e21820a74181787 Author: antonela <antonela(a)torproject.org> Date: Wed Sep 9 11:38:05 2020 -0300 Add menu item --- databags/about.ini | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/about.ini b/databags/about.ini index 184ae432..82bc62c9 100644 --- a/databags/about.ini +++ b/databags/about.ini @@ -10,6 +10,10 @@ label = People path = about/sponsors label = Sponsors +[membership] +path = about/membership +label = Membership + [reports] path = about/reports label = Reports @@ -21,4 +25,3 @@ label = Jobs [trademark] path = about/trademark label = Trademark -

1 0

[tpo/staging] Add about submenu to the membership page
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit c22321c033004a91a51190b110c6ef6cde750d0d Author: antonela <antonela(a)torproject.org> Date: Wed Sep 9 12:00:34 2020 -0300 Add about submenu to the membership page --- content/about/membership/contents.lr | 2 +- templates/membership.html | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/content/about/membership/contents.lr b/content/about/membership/contents.lr index 3c3465c6..69ef1aa9 100644 --- a/content/about/membership/contents.lr +++ b/content/about/membership/contents.lr @@ -1,6 +1,6 @@ section: About --- -section_id: membership +section_id: about --- html: membership.html --- diff --git a/templates/membership.html b/templates/membership.html index 385a4c49..f847dfaa 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -128,4 +128,3 @@ <h2 class="bg-white text-primary text-center p-4 mx-auto my-0">Become a Member</h2> <p class="bg-white text-center p-4">Join the Tor Project Membership Program and demonstrate your commitment to privacy online and become more deeply involved in the Tor community. Email us at <mark>giving(a)torproject.org.</mark> to get started.</p> </div> -</div>

1 0