Commit 2b439fb9 authored by Antonela's avatar Antonela 🔮
Browse files

Merge branch 'master' into 'master'

rebase master

See merge request !2
parents 4e7e21a3 2f017dda
......@@ -14,7 +14,7 @@
<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>
......@@ -115,7 +115,7 @@
<p><a href="" title="DuckDuckGo" target="_blank">DuckDuckGo</a></p>
<li class="list-group-item px-0">
<p><a href="" title="Insurgo, Inc" target="_blank">Insurgo, Inc</a></p>
<p><a href="" title="Insurgo, Inc" target="_blank">Insurgo</a></p>
<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 @@
<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="" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p>
<a class="btn btn-small bg-primary text-light my-4" href="" 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="" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Watch") }} </a></p>
<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?
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment