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

[tpo/staging] Update to htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 6a46ed82d7b83c7e81f22496625d5352bedc28a8 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 21:39:57 2019 +0100 Update to htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 3ba4df5..8041493 100644 --- a/.htaccess +++ b/.htaccess @@ -24,6 +24,7 @@ RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 RewriteRule ^overview(.*) /about/history$1 [R=301,L] # Projects +RewriteRule ^projects/torbrowser/design/(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] #Pluggable Transports

1 0

[tpo/staging] add board, core nav in people's page
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 985626e7d915ff83d903975d85a4d61e34c8adc4 Author: Antonela <hola(a)antonela.me> Date: Tue Mar 26 17:12:54 2019 -0300 add board, core nav in people's page --- templates/people.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/people.html b/templates/people.html index 207f451..2ce698f 100644 --- a/templates/people.html +++ b/templates/people.html @@ -1,5 +1,6 @@ <div class="container py-3"> - <h3 class="text-primary display-5">{{ _('Board of Directors') }}</h3> + <a class="text-primary display-5" href="#board">{{ _('Board of Directors') }}</a> + <a class="text-primary display-5 pl-5" href="#core">{{ _('Core Tor') }}</a> </div> <div class="container-fluid"> <div class="row"> @@ -10,7 +11,7 @@ {% endfor %} </div> </div> -<div class="container py-3"> +<div id="core" class="container py-3"> <h3 class="text-primary display-5">{{ _('Core Tor') }}</h3> </div> <div class="container-fluid">

1 0

[tpo/staging] Update to press page
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 02ed5bc97ee53e0773e168e6d1ed9e602badbe45 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 22:07:58 2019 +0100 Update to press page --- .htaccess | 2 +- content/press/contents.lr | 2 +- models/press.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 8041493..0f902e5 100644 --- a/.htaccess +++ b/.htaccess @@ -24,7 +24,7 @@ RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 RewriteRule ^overview(.*) /about/history$1 [R=301,L] # Projects -RewriteRule ^projects/torbrowser/design/(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] +RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] #Pluggable Transports diff --git a/content/press/contents.lr b/content/press/contents.lr index 2ec8f6a..ecf28a5 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -4,7 +4,7 @@ _model: press --- _discoverable: yes --- -_visible: yes +_hidden: no --- section: The Tor Project --- diff --git a/models/press.ini b/models/press.ini index d84e650..0f6af59 100644 --- a/models/press.ini +++ b/models/press.ini @@ -1,7 +1,7 @@ [model] name = Press label = {{ this.title }} -visible = yes +hidden = no discoverable = yes [fields.title]

1 0

[tpo/staging] Merge remote-tracking branch 'anto/master'
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 9cc3292334af9a8ea97e08ecbb97db08f59e295e Merge: 0022d64 985626e Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 21:13:45 2019 +0100 Merge remote-tracking branch 'anto/master' assets/static/images/tb85/TB8.svg | 179 ++++++++++++++++++++++++++++++ assets/static/images/tb85/tb85.png | Bin 46123 -> 58564 bytes assets/static/images/tb85/tb85(a)2x.png | Bin 107230 -> 147986 bytes content/about/people/antonela/contents.lr | 2 + templates/download-android.html | 2 +- templates/hero-home.html | 2 +- templates/history.html | 2 +- templates/navbar.html | 2 +- templates/people.html | 5 +- 9 files changed, 188 insertions(+), 6 deletions(-)

1 0

[tpo/staging] Removed weird unicode characters
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit c83908e2ebe04bc926fcb1dc2749e7a074fbbf92 Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 22:29:43 2019 +0100 Removed weird unicode characters --- assets/static/fonts/SourceSansPro/OFL.txt | 2 +- content/about/history/contents.lr | 18 +++++++++--------- content/about/jobs/backend-engineer-ooni/contents.lr | 8 ++++---- content/about/jobs/browser-developer/contents.lr | 2 +- content/about/jobs/contents.lr | 2 +- .../about/jobs/developer-data-architect/contents.lr | 8 ++++---- .../about/jobs/senior-system-administrator/contents.lr | 8 ++++---- content/about/people/biella/contents.lr | 2 +- content/about/people/cindy/contents.lr | 2 +- content/about/people/ohmygodel/contents.lr | 2 +- content/about/people/ssteele/contents.lr | 2 +- content/about/sponsors/DARPA-nrl/contents.lr | 2 +- content/about/sponsors/DARPA-penn/contents.lr | 2 +- content/about/sponsors/USSD-DHRL-harvard/contents.lr | 2 +- content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/imls-ny/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 ++-- content/about/sponsors/nsf-rochester/contents.lr | 2 +- content/about/sponsors/sida/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../press/blogging-where-speech-isn-t-free/contents.lr | 2 +- .../contents.lr | 2 +- content/press/contents.lr | 4 +--- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../we-can-t-outlaw-anonymous-web-services/contents.lr | 2 +- .../contents.lr | 2 +- content/thank-you/contents.lr | 2 +- templates/contact.html | 2 +- templates/download.html | 4 ++-- templates/home.html | 4 ++-- templates/jobs.html | 2 +- templates/people.html | 2 +- templates/projects.html | 2 +- 48 files changed, 68 insertions(+), 70 deletions(-) diff --git a/assets/static/fonts/SourceSansPro/OFL.txt b/assets/static/fonts/SourceSansPro/OFL.txt index 72d81ab..3e9c062 100644 --- a/assets/static/fonts/SourceSansPro/OFL.txt +++ b/assets/static/fonts/SourceSansPro/OFL.txt @@ -1,4 +1,4 @@ -Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/) with Reserved Font Name ‘Source’. +Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/) with Reserved Font Name ‘Source'. This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index d88836c..9dde452 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -12,11 +12,11 @@ title: History --- body: -The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “onion routing” began in the mid 1990s. +The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of "onion routing" began in the mid 1990s. -**Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** +**Just like Tor users, the developers, researchers, and funders who've made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** -In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL) asked themselves if there was a way to create internet connections that don’t reveal who is talking to whom, even to someone monitoring the network. +In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL) asked themselves if there was a way to create internet connections that don't reveal who is talking to whom, even to someone monitoring the network. Their answer was to create and deploy the first research designs and prototypes of onion routing. The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. @@ -26,24 +26,24 @@ In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of Techn To distinguish this original work at NRL from other onion routing efforts that were starting to pop up elsewhere, Roger called the project Tor, which stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, joined the project soon after. From its inception in the 1990s, onion routing was conceived to rely on a decentralized network. The network needed to be operated by entities with diverse interests and trust assumptions, and the software needed to be free and open to maximize transparency and separation. -That’s why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. +That's why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. By the end of 2003, the network had about a dozen volunteer nodes, mostly in the U.S., plus one in Germany. -Recognizing the benefit of Tor to digital rights, the [Electronic Frontier Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor’s development. +Recognizing the benefit of Tor to digital rights, the [Electronic Frontier Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor's development. In 2007, the organization began developing bridges to the Tor network to address censorship, such as the need to get around government firewalls, in order for its users to access the open web. Tor began gaining popularity among activists and tech-savvy users interested in privacy, but it was still difficult for less-technically savvy people to use, so starting in 2005, development of tools beyond just the Tor proxy began. Development of Tor Browser began in [2008](https://lists.torproject.org/pipermail/tor-talk/2008-January/007837.h…. -With Tor Browser having made Tor more accessible to everyday internet users and activists, Tor was an instrumental tool during the [Arab Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late 2010. It not only protected people’s identity online but also allowed them to access critical resources, social media, and websites which were blocked. +With Tor Browser having made Tor more accessible to everyday internet users and activists, Tor was an instrumental tool during the [Arab Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late 2010. It not only protected people's identity online but also allowed them to access critical resources, social media, and websites which were blocked. The need for tools safeguarding against mass surveillance became a mainstream concern thanks to the [Snowden revelations in 2013](https://www.theguardian.com/us-news/the-nsa-files). -Not only was Tor instrumental to Snowden’s whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). +Not only was Tor instrumental to Snowden's whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). -People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. +People's awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. Today, the network has [thousands of relays](https://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. -We, at the Tor Project, fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. +We, at the Tor Project, fight every day for everyone to have private access to an uncensored internet, and Tor has become the world's strongest tool for privacy and freedom online. But Tor is more than just software. It is a labor of love produced by an international community of people devoted to human rights. The Tor Project is [deeply committed](https://blog.torproject.org/tor-social-contract) to transparency and the safety of its users. diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr index cf78f24..6a696e2 100644 --- a/content/about/jobs/backend-engineer-ooni/contents.lr +++ b/content/about/jobs/backend-engineer-ooni/contents.lr @@ -13,7 +13,7 @@ title: Backend Engineer for OONI summary: The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. -You will be working to improve OONI’s data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. +You will be working to improve OONI's data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. --- description: @@ -23,7 +23,7 @@ description: The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. -You will be working to improve OONI’s data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. +You will be working to improve OONI's data processing pipeline and other backend components responsible for recording measurements collected from our growing global user network. You will also be tasked with improving our network measurement methodologies and data analysis heuristics to increase the accuracy of our experiments. This is a full-time 12-month contract position, starting ASAP (no later than mid-May 2019); contract may be extended. @@ -42,7 +42,7 @@ Here are some of our code repositories: - Extensive experience in python or golang. - Comfortable working remotely. - Self-directed, self-disciplined, but good at working and communicating with a team. - - Have experience and be comfortable with others reviewing your code and design; have experience and be comfortable reviewing others’ code. + - Have experience and be comfortable with others reviewing your code and design; have experience and be comfortable reviewing others' code. - Experience documenting and designing protocols. - Be comfortable with transparency! @@ -76,6 +76,6 @@ Email should be sent to jobs at openobservatory dot org with "OONI Backend Engin The Open Observatory of Network Interference (OONI) is a free software project under the Tor Project. OONI collects and processes network measurements with the aim of detecting network interferences, such as censorship, surveillance, and traffic manipulation. Since late 2012, OONI has collected millions of measurements across more than 90 countries around the world. -The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project’s mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project's mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr index 6961dd6..c82e51b 100644 --- a/content/about/jobs/browser-developer/contents.lr +++ b/content/about/jobs/browser-developer/contents.lr @@ -71,6 +71,6 @@ Email should be sent to job-browser at torproject.org with "Browser Developer" i Link to at least one of your code samples (ideally, more than one and all of which we will presume you are authorized to disclose). No phone calls, please! About the Organization: -The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project’s mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle with paid staff and contractors of around 45 engineers and operational support people, plus many volunteers all over the world. Tor develops free and open source software for privacy and freedom online, protecting people from tracking, surveillance, and censorship. The Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. The Tor Project's mission is to advance human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, support their unrestricted availability and use, and further their scientific and popular understanding. The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/contents.lr b/content/about/jobs/contents.lr index 7114a31..63e1d9a 100644 --- a/content/about/jobs/contents.lr +++ b/content/about/jobs/contents.lr @@ -14,4 +14,4 @@ title: Jobs --- body: -We’re always looking for more great people to join our team. Join us in our Seattle office or work remotely from wherever you are in the world. You’ll work with a diverse group of bright and passionate folks committed to fostering internet freedom worldwide. +We're always looking for more great people to join our team. Join us in our Seattle office or work remotely from wherever you are in the world. You'll work with a diverse group of bright and passionate folks committed to fostering internet freedom worldwide. diff --git a/content/about/jobs/developer-data-architect/contents.lr b/content/about/jobs/developer-data-architect/contents.lr index 8228fda..d3ec5e0 100644 --- a/content/about/jobs/developer-data-architect/contents.lr +++ b/content/about/jobs/developer-data-architect/contents.lr @@ -18,7 +18,7 @@ Internet Freedom Nonprofit Seeks Metrics Data Architect The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking an experienced Data Architect to take our metrics work to the next level. -Tor is for everyone, and we are actively working to build a team that represents people from all over the world — people from diverse ethnic, national, and cultural backgrounds; people from all walks of life. +Tor is for everyone, and we are actively working to build a team that represents people from all over the world - people from diverse ethnic, national, and cultural backgrounds; people from all walks of life. Racial minorities, non-gender-binary people, women, and people from any group that is generally underrepresented in tech are encouraged to apply. The team: @@ -34,7 +34,7 @@ How we achieve our goals: * Scalability (as the network grows, so does our data) * Transparency (our community rightly wants to know what data we're collecting) -The Tor Metrics team presently consists of two full-time developers; this position will be the third. Our team works asynchronously on each person’s own schedule, but we sync regularly via Git, Trac, IRC, e-mail, and an occasional video chat. +The Tor Metrics team presently consists of two full-time developers; this position will be the third. Our team works asynchronously on each person's own schedule, but we sync regularly via Git, Trac, IRC, e-mail, and an occasional video chat. The most interesting challenge for the Metrics team is how to gather data on an anonymity system without de-anonymizing users. @@ -77,10 +77,10 @@ Bonus skills: * Networking background: Experience working with networks and measurements in the past. * You support Internet Freedom! -This is a full-time position that can be done remotely/internationally or in our office in Seattle, WA. To apply, send a cover letter that includes a statement about why you want to work at the Tor Project, your CV/resume (including three professional references), and a link to a code sample or some non-trivial software project you have significantly contributed to. All documents should be in PDF format labeled with your name. Please send to job-metrics at torproject dot org with “Metrics Data Architect” in the subject line. No phone calls please! +This is a full-time position that can be done remotely/internationally or in our office in Seattle, WA. To apply, send a cover letter that includes a statement about why you want to work at the Tor Project, your CV/resume (including three professional references), and a link to a code sample or some non-trivial software project you have significantly contributed to. All documents should be in PDF format labeled with your name. Please send to job-metrics at torproject dot org with "Metrics Data Architect" in the subject line. No phone calls please! Flexible salary, depending on experience. The Tor Project has a highly competitive benefits package, including a generous PTO policy; paid holidays (including the week between Christmas and New Year's, when the office is closed); health, vision, dental, disability, and life insurance paid in full for employee; 401(k); and flexible work schedule. (Please note that benefits package specifics can vary slightly from country to country, but we aim to treat everyone equally.) -The Tor Project's workforce is smart and committed. The Tor Project currently has a paid and contract staff of around 47 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations. If you’re new to the Tor Project scene, are curious what our workplace culture is like, or just want to read about how fun our semi-annual meetings are, hear what our new Development Director had to say about all of it: https://blog.torproject.org/reflections-tor-meeting-newbie. +The Tor Project's workforce is smart and committed. The Tor Project currently has a paid and contract staff of around 47 developers and operational support staff, plus many thousands of volunteers who contribute to our work. The Tor Project is funded in part by government research and development grants, and in part by individual, foundation and corporate donations. If you're new to the Tor Project scene, are curious what our workplace culture is like, or just want to read about how fun our semi-annual meetings are, hear what our new Development Director had to say about all of it: https://blog.torproject.org/reflections-tor-meeting-newbie. The Tor Project, Inc., is an equal opportunity, affirmative action employer. diff --git a/content/about/jobs/senior-system-administrator/contents.lr b/content/about/jobs/senior-system-administrator/contents.lr index b2d9fb2..1598dae 100644 --- a/content/about/jobs/senior-system-administrator/contents.lr +++ b/content/about/jobs/senior-system-administrator/contents.lr @@ -15,8 +15,8 @@ summary: Internet Freedom Nonprofit Seeks Senior Systems Administrator (Posted July 25, 2018) -The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking a Senior Systems Administrator to maintain, upgrade and manage our organization’s software, hardware, and networks. -The goal of the Tor Project’s sysadmin will be to ensure that our technology infrastructure runs securely, smoothly, and efficiently and that Tor Project employees, contractors, and volunteers have the knowledge and resources to do their work. +The Tor Project, Inc., a 501(c)(3) nonprofit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, is seeking a Senior Systems Administrator to maintain, upgrade and manage our organization's software, hardware, and networks. +The goal of the Tor Project's sysadmin will be to ensure that our technology infrastructure runs securely, smoothly, and efficiently and that Tor Project employees, contractors, and volunteers have the knowledge and resources to do their work. The ideal candidate is resourceful, creative, and able to diagnose and resolve problems quickly. Our sysadmin must have the patience to communicate with a variety of interdisciplinary teams and users, including some who are not technical and others who are extremely technical. @@ -27,9 +27,9 @@ This job requires a jack-of-all-trades, and every day is likely to present new a description: The ideal candidate will have at least five years of experience running open source systems. -This is a senior level position that reports directly to the Executive Director and is part of the organization’s leadership team. +This is a senior level position that reports directly to the Executive Director and is part of the organization's leadership team. This person will manage one direct report, our Junior Services Administrator. -This will be the organization’s first paid sysadmin, and a willingness to work with our highly effective, long-term volunteer sysadmins is essential. +This will be the organization's first paid sysadmin, and a willingness to work with our highly effective, long-term volunteer sysadmins is essential. Responsibilities: diff --git a/content/about/people/biella/contents.lr b/content/about/people/biella/contents.lr index 86d6069..42297bf 100644 --- a/content/about/people/biella/contents.lr +++ b/content/about/people/biella/contents.lr @@ -16,5 +16,5 @@ description: Gabriella holds the Wolfe Chair in Scientific and Technological Literacy at McGill University. Trained as an anthropologist, her scholarship explores the intersection of the cultures of hacking and politics. -She has authored two books, Coding Freedom: The Ethics and Aesthetics of Hacking (Princeton University Press, 2012) and Hacker, Hoaxer, Whistleblower, Spy: The Many Faces of Anonymous (Verso, 2014), which was named to Kirkus Reviews’ Best Books of 2014 and was awarded the Diana Forsythe Prize by the American Anthropological Association. +She has authored two books, Coding Freedom: The Ethics and Aesthetics of Hacking (Princeton University Press, 2012) and Hacker, Hoaxer, Whistleblower, Spy: The Many Faces of Anonymous (Verso, 2014), which was named to Kirkus Reviews' Best Books of 2014 and was awarded the Diana Forsythe Prize by the American Anthropological Association. She has written for popular media outlets, including the New York Times, Slate, Wired, MIT Technology Review, Huffington Post, and the Atlantic. diff --git a/content/about/people/cindy/contents.lr b/content/about/people/cindy/contents.lr index 410482d..e967068 100644 --- a/content/about/people/cindy/contents.lr +++ b/content/about/people/cindy/contents.lr @@ -13,6 +13,6 @@ nickname: cindy description: Cindy is the Executive Director of the Electronic Frontier Foundation (EFF). -From 2000 to 2015 she served as EFF’s Legal Director as well as its General Counsel. +From 2000 to 2015 she served as EFF's Legal Director as well as its General Counsel. Cindy first became involved with EFF in 1993, when EFF asked her to serve as the outside lead attorney in Bernstein v. Dept. of Justice, the successful First Amendment challenge to the U.S. export restrictions on cryptography. Ms. Cohn works to ensure that people around the world have the right to access information and communicate privately and anonymously, including mounting lawsuits against NSA spying, providing legal counsel to computer programmers building and developing privacy and anonymity tools, and helping to develop the Necessary and Proportionate Principles applying international human rights standards to digital communications surveillance. diff --git a/content/about/people/ohmygodel/contents.lr b/content/about/people/ohmygodel/contents.lr index fd00f4b..4168618 100644 --- a/content/about/people/ohmygodel/contents.lr +++ b/content/about/people/ohmygodel/contents.lr @@ -16,4 +16,4 @@ image: /static/images/people/ohmygodel.png --- description: -NRL researcher in applied cryptography with an interest in Tor’s security and privacy. +NRL researcher in applied cryptography with an interest in Tor's security and privacy. diff --git a/content/about/people/ssteele/contents.lr b/content/about/people/ssteele/contents.lr index 2cf156f..10a1e94 100644 --- a/content/about/people/ssteele/contents.lr +++ b/content/about/people/ssteele/contents.lr @@ -14,4 +14,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](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. +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. diff --git a/content/about/sponsors/DARPA-nrl/contents.lr b/content/about/sponsors/DARPA-nrl/contents.lr index 88ea349..36dbffd 100644 --- a/content/about/sponsors/DARPA-nrl/contents.lr +++ b/content/about/sponsors/DARPA-nrl/contents.lr @@ -14,4 +14,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense --- description: -DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) to complicate adversarial targeting; (2) disguising the characteristics and behaviors of those assets through networked maneuver to confuse or deceive the adversary; and (3) using adaptive mitigation techniques on endpoints (e.g., mission-critical servers) to blunt the effects of attacks that succeed in penetrating other defensive measures. +DARPA's Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks by: (1) dispersing cyber assets (physically and/or logically) to complicate adversarial targeting; (2) disguising the characteristics and behaviors of those assets through networked maneuver to confuse or deceive the adversary; and (3) using adaptive mitigation techniques on endpoints (e.g., mission-critical servers) to blunt the effects of attacks that succeed in penetrating other defensive measures. diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index 78ea646..1916f4d 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/content/about/sponsors/DARPA-penn/contents.lr @@ -16,4 +16,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense --- description: -DARPA’s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This grant supports our work addressing denial of service attacks on free and open communication on the internet. +DARPA's Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This grant supports our work addressing denial of service attacks on free and open communication on the internet. diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr index 4820c17..7433b91 100644 --- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr +++ b/content/about/sponsors/USSD-DHRL-harvard/contents.lr @@ -16,4 +16,4 @@ link: https://www.state.gov/j/drl/ --- description: -The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote democracy, protect human rights and international religious freedom, and advance labor rights globally. This funding is being used by Tor’s OONI team to work toward creating a system that provides real-time measurement of online censorship. +The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote democracy, protect human rights and international religious freedom, and advance labor rights globally. This funding is being used by Tor's OONI team to work toward creating a system that provides real-time measurement of online censorship. diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index c93eba9..360a9f2 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/content/about/sponsors/fastly/contents.lr @@ -15,5 +15,5 @@ _hidden: yes link: https://www.fastly.com/ --- description: -Fastly’s global edge cloud platform processes, serves, and secures applications as close to users as possible, at the edge of the network. +Fastly's global edge cloud platform processes, serves, and secures applications as close to users as possible, at the edge of the network. Fastly generously hosts our Tor Browser update downloads that can be fetched anonymously. diff --git a/content/about/sponsors/imls-ny/contents.lr b/content/about/sponsors/imls-ny/contents.lr index a77bef8..a4927c1 100644 --- a/content/about/sponsors/imls-ny/contents.lr +++ b/content/about/sponsors/imls-ny/contents.lr @@ -16,4 +16,4 @@ link: https://www.imls.gov/ --- description: -Institute of Museum and Library Services advances, supports, and empowers America's museums, libraries, and related organizations through grantmaking, research, and policy development. This grant helps fund Tor’s affiliate project, Library Freedom Institute, which advances the use of practical privacy tools in libraries and their communities through the development of a privacy-focused train-the-trainer program for librarians. +Institute of Museum and Library Services advances, supports, and empowers America's museums, libraries, and related organizations through grantmaking, research, and policy development. This grant helps fund Tor's affiliate project, Library Freedom Institute, which advances the use of practical privacy tools in libraries and their communities through the development of a privacy-focused train-the-trainer program for librarians. diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index 4ef064e..69835dc 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/content/about/sponsors/mozilla/contents.lr @@ -16,5 +16,5 @@ link: https://www.mozilla.org/en-US/moss/ --- description: -Mozilla’s mission is to ensure the Internet is a global public resource, open and accessible to all. -Several grants from Mozilla, including the Mozilla Open Source Support (MOSS) awards program, helped with the following projects: maintaining TorBirdy, a plugin to connect your email client Thunderbird with Tor; modularization of Tor network codebase making it more accessible, faster, and easier to adopt; significant improvements to OONI Explorer; Open Web Fellowship; Glass Room exhibit; and Mozilla’s year-end matching funds that help all of Tor’s important work. +Mozilla's mission is to ensure the Internet is a global public resource, open and accessible to all. +Several grants from Mozilla, including the Mozilla Open Source Support (MOSS) awards program, helped with the following projects: maintaining TorBirdy, a plugin to connect your email client Thunderbird with Tor; modularization of Tor network codebase making it more accessible, faster, and easier to adopt; significant improvements to OONI Explorer; Open Web Fellowship; Glass Room exhibit; and Mozilla's year-end matching funds that help all of Tor's important work. diff --git a/content/about/sponsors/nsf-rochester/contents.lr b/content/about/sponsors/nsf-rochester/contents.lr index a26f278..381b7e9 100644 --- a/content/about/sponsors/nsf-rochester/contents.lr +++ b/content/about/sponsors/nsf-rochester/contents.lr @@ -16,4 +16,4 @@ link: https://nsf.gov/ --- description: -The National Science Foundation funds research and education in most fields of science and engineering. We’re using this grant to improve our defense of website fingerprinting in Tor. +The National Science Foundation funds research and education in most fields of science and engineering. We're using this grant to improve our defense of website fingerprinting in Tor. diff --git a/content/about/sponsors/sida/contents.lr b/content/about/sponsors/sida/contents.lr index 21465c0..cc4548b 100644 --- a/content/about/sponsors/sida/contents.lr +++ b/content/about/sponsors/sida/contents.lr @@ -17,4 +17,4 @@ link: https://www.sida.se/English/ description: Sida is a government agency working on behalf of the Swedish parliament and government, with the mission to reduce poverty in the world. -Through their work and in cooperation with others, Sida contributes to implementing Sweden’s Policy for Global Development. +Through their work and in cooperation with others, Sida contributes to implementing Sweden's Policy for Global Development. diff --git a/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr b/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr index 9df1013..da62520 100644 --- a/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr +++ b/content/press/2-5-million-tor-users-can-t-all-be-criminals/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: AFP --- title: -2.5 million Tor users can’t all be criminals! +2.5 million Tor users can't all be criminals! --- link: http://fr.canoe.ca/techno/internet/archives/2015/03/20150303-125006.html --- diff --git a/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr b/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr index 8b4917e..44f1a13 100644 --- a/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr +++ b/content/press/activists-vow-to-defeat-iran-s-internet-censorship/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: GigaOM --- -title: Activists vow to defeat Iran’s Internet censorship +title: Activists vow to defeat Iran's Internet censorship --- link: http://gigaom.com/2012/02/27/iran-elections-censorship-tor-balatarin/ --- diff --git a/content/press/blogging-where-speech-isn-t-free/contents.lr b/content/press/blogging-where-speech-isn-t-free/contents.lr index ffc852f..b099cb7 100644 --- a/content/press/blogging-where-speech-isn-t-free/contents.lr +++ b/content/press/blogging-where-speech-isn-t-free/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: World Changing --- title: -Blogging Where Speech Isn’t Free +Blogging Where Speech Isn't Free --- link: http://www.worldchanging.com/archives/006309.html --- diff --git a/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr b/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr index 9f9fdd5..47c8e7e 100644 --- a/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr +++ b/content/press/china-rights-forum-no-2-china-s-internet-staking-digital-ground/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: China Rights Forum --- -title: China Rights Forum, No. 2 - “China’s Internet”: Staking Digital Ground +title: China Rights Forum, No. 2 - “China's Internet”: Staking Digital Ground --- link: http://www.hrichina.org/public/contents/category?cid=175033 --- diff --git a/content/press/contents.lr b/content/press/contents.lr index ecf28a5..b993636 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -16,6 +16,4 @@ color: primary --- title: Press --- -body: - -Email inquiries to press(a)torproject.org. +body: Email inquiries to press(a)torproject.org. diff --git a/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr b/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr index 32462de..992686a 100644 --- a/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr +++ b/content/press/doj-s-ovie-carroll-tor-helps-protect-sensitive-user-information/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: The Merkle --- title: -DOJ’s Ovie Carroll: “Tor Helps Protect Sensitive User Information” +DOJ's Ovie Carroll: “Tor Helps Protect Sensitive User Information” --- link: http://themerkle.com/dojs-ovie-carroll-tor-helps-protect-sensitive-user-inf… --- diff --git a/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr b/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr index bf4acc5..47ffb3b 100644 --- a/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr +++ b/content/press/don-t-panic-tor-is-still-safe-and-here-s-why/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wired.co.UK --- title: -Don't panic, Tor is still safe and Here’s Why +Don't panic, Tor is still safe and Here's Why --- link: http://www.wired.co.uk/news/archive/2014-11/20/tor-still-secure --- diff --git a/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr b/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr index 6f78ab3..2efa176 100644 --- a/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr +++ b/content/press/facebook-helps-tor-s-hidden-sites-get-official-recognition/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: The Verge --- -title: Facebook helps Tor’s hidden sites get official recognition +title: Facebook helps Tor's hidden sites get official recognition --- link: http://www.theverge.com/2015/10/28/9631006/tor-hidden-addresses-recognition --- diff --git a/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr b/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr index a4e99ca..e765134 100644 --- a/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr +++ b/content/press/fbi-s-tor-vpntargeted-warrants-amount-to-court-sanctioned-mass-surveillance/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: The Mac Observer --- -title: FBI’s TOR, VPNtargeted Warrants Amount to Court Sanctioned Mass Surveillance +title: FBI's TOR, VPNtargeted Warrants Amount to Court Sanctioned Mass Surveillance --- link: https://www.macobserver.com/tmo/article/fbis-tor-vpn-targeted-warrants-amou… --- diff --git a/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr b/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr index a9ba8a1..b58b9ae 100644 --- a/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr +++ b/content/press/five-tools-for-journalists-online-safety-privacy-highlighted-during-aaron-swartz-day-event/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: International Journalists Network (IJNet) --- -title: Five tools for journalists’ online safety, privacy highlighted during Aaron Swartz Day event +title: Five tools for journalists' online safety, privacy highlighted during Aaron Swartz Day event --- link: https://ijnet.org/en/blog/five-tools-journalists%E2%80%99-online-safety-pri… --- diff --git a/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr b/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr index 510d009..ef1a5bf 100644 --- a/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr +++ b/content/press/how-this-west-philly-activist-became-tor-s-first-director-of-communications/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: Technically Philly --- -title: How this West Philly activist became Tor’s first director of communications +title: How this West Philly activist became Tor's first director of communications --- link: https://technical.ly/philly/2015/07/16/kate-krauss-tor/ --- diff --git a/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr b/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr index c3580f1..517461d 100644 --- a/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr +++ b/content/press/inside-philly-s-growing-internet-privacy-community/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: Technically Philly --- -title: Inside Philly’s Growing Internet Privacy Community +title: Inside Philly's Growing Internet Privacy Community --- link: https://technical.ly/philly/2015/07/08/philadelphia-internet-privacy-tor/ --- diff --git a/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr b/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr index e8664f5..a67ca8f 100644 --- a/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr +++ b/content/press/make-it-harder-for-the-gov-t-to-track-your-shutdownzimbabwe2016-messages/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: http://www.htxt. co.za/ --- title: -Make it harder for the gov’t to track your #ShutdownZimbabwe2016 messages +Make it harder for the gov't to track your #ShutdownZimbabwe2016 messages --- link: http://www.htxt.co.za/2016/07/07/make-it-harder-for-the-govt-to-track-your-… --- diff --git a/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr b/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr index a6ff88f..bfc06ae 100644 --- a/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr +++ b/content/press/mapping-how-tor-s-anonymity-network-spread-around-the-world/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wired --- title: -Mapping How Tor’s Anonymity Network Spread Around the World +Mapping How Tor's Anonymity Network Spread Around the World --- link: http://www.wired.com/2015/09/mapping-tors-anonymity-network-spread-around-w… --- diff --git a/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr b/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr index 8264f4d..3361fdb 100644 --- a/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr +++ b/content/press/propublica-launches-the-dark-web-s-first-major-news-site/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wired --- title: -ProPublica Launches the Dark Web’s First Major News Site +ProPublica Launches the Dark Web's First Major News Site --- link: https://www.wired.com/2016/01/propublica-launches-the-dark-webs-first-major… --- diff --git a/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr b/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr index 0529fda..172b273 100644 --- a/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr +++ b/content/press/security-and-privacy-on-the-internet-with-julia-angwen-and-tor-project-s-kate-krauss-starts-at-13-30/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: WHYY Radio --- title: -Security and Privacy on the Internet, with Julia Angwen and Tor Project’s Kate Krauss (starts at 13:30) +Security and Privacy on the Internet, with Julia Angwen and Tor Project's Kate Krauss (starts at 13:30) --- link: https://technical.ly/philly/2015/07/24/kate-krauss-radio-times/ --- diff --git a/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr b/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr index 5338432..2fe6090 100644 --- a/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr +++ b/content/press/tor-is-software-for-keeping-things-online-anonymous/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Statesman --- title: -‘Tor’ is software for keeping things online anonymous +‘Tor' is software for keeping things online anonymous --- link: http://www.statesman.com/news/technology/tor-is-software-for-keeping-things… --- diff --git a/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr b/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr index d3a5b45..5710ef2 100644 --- a/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr +++ b/content/press/tor-project-is-tapping-amazon-s-ec2-cloud-service/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: IT Security Belgium --- -title: Tor Project is tapping Amazon’s EC2 cloud service +title: Tor Project is tapping Amazon's EC2 cloud service --- link: http://www.itsecurity.be/tor-project-is-tapping-amazons-ec2-cloud-service --- diff --git a/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr b/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr index cfeaed6..a6ac958 100644 --- a/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr +++ b/content/press/tor-s-new-social-contract-includes-no-backdoors-pledge/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: TechCrunch --- -title: Tor’s new social contract includes ‘no backdoors’ pledge +title: Tor's new social contract includes ‘no backdoors' pledge --- link: https://techcrunch.com/2016/08/10/tors-new-social-contract-includes-no-back… --- diff --git a/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr b/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr index 741ba0b..538a262 100644 --- a/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr +++ b/content/press/u-s-cloud-providers-face-backlash-from-china-s-censors/contents.lr @@ -9,7 +9,7 @@ type: snippet publisher: Wall Street Journal --- title: -U.S. Cloud Providers Face Backlash From China’s Censors +U.S. Cloud Providers Face Backlash From China's Censors --- link: http://www.wsj.com/articles/u-s-cloud-providers-face-backlash-from-chinas-c… --- diff --git a/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr b/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr index e67a404..c5929b9 100644 --- a/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr +++ b/content/press/we-can-t-outlaw-anonymous-web-services/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: The Hill --- -title: We Can’t Outlaw Anonymous Web Services +title: We Can't Outlaw Anonymous Web Services --- link: https://thehill.com/policy/cybersecurity/235171-uk-lawmakers-we-cant-ban-on… --- diff --git a/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr b/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr index 9b62679..76c855d 100644 --- a/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr +++ b/content/press/when-iran-s-regime-falls-this-will-be-remembered-as-the-youtube-revolution/contents.lr @@ -8,7 +8,7 @@ type: snippet --- publisher: Times Online --- -title: When Iran’s regime falls this will be remembered as the YouTube revolution +title: When Iran's regime falls this will be remembered as the YouTube revolution --- link: http://www.timesonline.co.uk/tol/news/world/middle_east/article6969958.ece --- diff --git a/content/thank-you/contents.lr b/content/thank-you/contents.lr index 3ba1f1e..c0e4058 100644 --- a/content/thank-you/contents.lr +++ b/content/thank-you/contents.lr @@ -12,7 +12,7 @@ title: Success --- body: -You’re equipped to browse freely. +You're equipped to browse freely. Tor is the strongest tool for privacy and freedom online. It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. We need your help to keep Tor secure and safe for millions across the globe. [Donate Now](https://donate.torproject.org/) diff --git a/templates/contact.html b/templates/contact.html index 187b6c0..4973b6e 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -11,7 +11,7 @@ <p class="text-tpo"><span class="text-primary nick">#tor-project</span> - {{ _("Discuss organization and community related topics: meetups, outreach, translation, or website improvements.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-meeting</span> - {{ _("Watch or join publicly logged team meetings.") }}</p> <p class="text-tpo"><span class="text-primary nick">#tor-relays</span> - {{ _("Discuss running a Tor relay.") }}</p> - <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor’s global south community.") }}</p> + <p class="text-tpo"><span class="text-primary nick">#tor-south</span> - {{ _("Talk with Tor's global south community.") }}</p> </div> <div class="d-block d-sm-none container py-3"> <div class="row border-bottom border-light"><p></p></div> diff --git a/templates/download.html b/templates/download.html index 48f0b53..d27d14b 100644 --- a/templates/download.html +++ b/templates/download.html @@ -10,8 +10,8 @@ <p class="text-tpo">{{ _('Select "Tor is censored in my country."') }}</p> </div> <div class="row pl-3 pr-5 text-tpo"> - <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won’t connect is an incorrect system clock. Please make sure it’s set correctly.') }}</p> - <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ’s at our Support Portal') }}</a></h6> + <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won\'t connect is an incorrect system clock. Please make sure it\'s set correctly.') }}</p> + <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> </div> </div> <div class="col-sm-6"> diff --git a/templates/home.html b/templates/home.html index 1e700d1..befd710 100644 --- a/templates/home.html +++ b/templates/home.html @@ -9,7 +9,7 @@ <div class="col-md-7 px-3 order-2"> <div class="card-block px-3 py-5"> <h4 class="pt-3 card-title text-primary">{{ _("BLOCK TRACKERS") }}</h4> - <p class="card-text">{{ _("Tor Browser isolates each website you visit so third-party trackers and ads can’t follow you. Any cookies automatically clear when you’re done browsing. So will your browsing history.") }}</p> + <p class="card-text">{{ _("Tor Browser isolates each website you visit so third-party trackers and ads can't follow you. Any cookies automatically clear when you're done browsing. So will your browsing history.") }}</p> </div> </div> </div> @@ -26,7 +26,7 @@ <div class="col-md-7 px-3 order-md-1"> <div class="card-block px-3 py-5"> <h4 class="pt-3 card-title text-primary">{{ _("DEFEND AGAINST SURVEILLANCE") }}</h4> - <p class="card-text">{{ _("Tor Browser prevents someone watching your connection from knowing what websites you visit. All anyone monitoring your browsing habits can see is that you’re using Tor.") }}</p> + <p class="card-text">{{ _("Tor Browser prevents someone watching your connection from knowing what websites you visit. All anyone monitoring your browsing habits can see is that you're using Tor.") }}</p> </div> </div> </div> diff --git a/templates/jobs.html b/templates/jobs.html index 90bc86f..3e948ca 100644 --- a/templates/jobs.html +++ b/templates/jobs.html @@ -25,6 +25,6 @@ </div> </div> <div class="row"> - <p>{{ _("Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="/contact">{{ _("We invite you to join us on IRC to find how you can get involved.") }}</a></p> + <p>{{ _("Think you could help us in a position that's not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="/contact">{{ _("We invite you to join us on IRC to find how you can get involved.") }}</a></p> </div> </div> diff --git a/templates/people.html b/templates/people.html index 2ce698f..fba0466 100644 --- a/templates/people.html +++ b/templates/people.html @@ -26,7 +26,7 @@ <div class="container p-3 col-6"> <div class="row justify-content-center"> <h4 class="text-primary display-5">{{ _('Join Our Team') }}</h4> - <p class="text-center">{{ _("Even if we aren’t hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you’re a developer, we welcome you to sign up for our dev mailing list to see what we’re up to.") }}</p> + <p class="text-center">{{ _("Even if we aren't hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you're a developer, we welcome you to sign up for our dev mailing list to see what we're up to.") }}</p> <button class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> {{ _("Sign up for tor-dev") }}<i class="oi oi-arrow-right pl-3" title="icon arrow-right" aria-hidden="true"></i> </button> diff --git a/templates/projects.html b/templates/projects.html index 246c9ca..ed08781 100644 --- a/templates/projects.html +++ b/templates/projects.html @@ -30,6 +30,6 @@ </div> </div> <div class="row"> - <p>{{ _("Think you could help us in a position that’s not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="">{{ _('We invite you to join us on IRC to find how you can get involved.') }}</a></p> + <p>{{ _("Think you could help us in a position that's not listed? We also rely on a vast community of volunteer contributors and many have become paid staff.") }} <a href="">{{ _('We invite you to join us on IRC to find how you can get involved.') }}</a></p> </div> </div>

1 0

[tpo/staging] Fix UI label typo
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 9c9388dbd3b1b8f96007c29f3e6d6ac270670b08 Author: Antonela <hola(a)antonela.me> Date: Tue Mar 26 16:59:15 2019 -0300 Fix UI label typo --- assets/static/images/tb85/TB8.svg | 179 ++++++++++++++++++++++++++++++++++ assets/static/images/tb85/tb85.png | Bin 46123 -> 58564 bytes assets/static/images/tb85/tb85(a)2x.png | Bin 107230 -> 147986 bytes 3 files changed, 179 insertions(+) diff --git a/assets/static/images/tb85/TB8.svg b/assets/static/images/tb85/TB8.svg new file mode 100644 index 0000000..f4205b4 --- /dev/null +++ b/assets/static/images/tb85/TB8.svg @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="1000px" height="312px" viewBox="0 0 1000 312" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +  + <title>TB8</title> + <desc>Created with Sketch.</desc> + <defs> + <rect id="path-1" x="0" y="0" width="1000" height="236"></rect> + <path d="M0,4.99884334 C0,2.2380584 2.2412813,0 4.99563986,0 L995.00436,0 C997.763376,0 1000,2.23688538 1000,4.99884334 L1000,39 L0,39 L0,4.99884334 Z" id="path-3"></path> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-4"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-5"> + <stop stop-color="#420C5D" offset="0%"></stop> + <stop stop-color="#951AD1" offset="100%"></stop> + </linearGradient> + <path d="M0.78125,0.90625 C4.76805554,0.90625 8,4.12420336 8,8.09375 C8,12.0632966 4.76805554,15.28125 0.78125,15.28125 L0.78125,0.90625 Z" id="path-6"></path> + <filter x="-581.8%" y="-236.5%" width="1042.0%" height="573.0%" filterUnits="objectBoundingBox" id="filter-7"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> + </filter> + </defs> + <g id="Landings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Download-Desktop---review" transform="translate(-220.000000, -670.000000)"> + <g id="Hero"> + <g id="TB8" transform="translate(220.000000, 670.000000)"> + <g id="Group-4" transform="translate(0.000000, 76.000000)"> + <mask id="mask-2" fill="white"> + <use xlink:href="#path-1"></use> + </mask> + <use id="Rectangle" fill="#401753" fill-rule="nonzero" xlink:href="#path-1"></use> + <g id="Group-5" opacity="0.06" mask="url(#mask-2)"> + <g transform="translate(-158.000000, -66.000000)"> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="206.5" cy="201.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="206.5" cy="201.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="207.121495" cy="202.121495" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="206.5" cy="201.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="424.5" cy="339.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="424.5" cy="339.5" r="50.3411215"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="551.5" cy="66.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="551.5" cy="66.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="552.121495" cy="67.1214953" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="551.5" cy="66.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="983.5" cy="339.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="983.5" cy="339.5" r="50.3411215"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1109.5" cy="66.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1109.5" cy="66.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1110.1215" cy="67.1214953" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1109.5" cy="66.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="768.5" cy="201.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="768.5" cy="201.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="769.121495" cy="202.121495" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="768.5" cy="201.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="704.5" cy="339.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="704.5" cy="339.5" r="50.3411215"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="831.5" cy="66.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="831.5" cy="66.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="832.121495" cy="67.1214953" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="831.5" cy="66.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1049.5" cy="201.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1049.5" cy="201.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1050.1215" cy="202.121495" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="1049.5" cy="201.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="145.5" cy="339.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="145.5" cy="339.5" r="50.3411215"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="269.5" cy="66.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="269.5" cy="66.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="270.121495" cy="67.1214953" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="269.5" cy="66.5" r="19.2663551"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="486.5" cy="201.5" r="66.5"></circle> + <circle id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" cx="486.5" cy="201.5" r="50.3411215"></circle> + <circle id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" cx="487.121495" cy="202.121495" r="34.8037383"></circle> + <circle id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" cx="486.5" cy="201.5" r="19.2663551"></circle> + <path d="M564.5,406 C601.226936,406 631,376.226936 631,339.5 C631,302.773064 601.226936,273 564.5,273 C527.773064,273 498,302.773064 498,339.5 C498,376.226936 527.773064,406 564.5,406 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M564.5,389.841121 C592.302634,389.841121 614.841121,367.302634 614.841121,339.5 C614.841121,311.697366 592.302634,289.158879 564.5,289.158879 C536.697366,289.158879 514.158879,311.697366 514.158879,339.5 C514.158879,367.302634 536.697366,389.841121 564.5,389.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M691.5,133 C728.226936,133 758,103.226936 758,66.5 C758,29.7730641 728.226936,0 691.5,0 C654.773064,0 625,29.7730641 625,66.5 C625,103.226936 654.773064,133 691.5,133 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="6,10"></path> + <path d="M691.5,116.841121 C719.302634,116.841121 741.841121,94.3026337 741.841121,66.5 C741.841121,38.6973663 719.302634,16.1588785 691.5,16.1588785 C663.697366,16.1588785 641.158879,38.6973663 641.158879,66.5 C641.158879,94.3026337 663.697366,116.841121 691.5,116.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="6,10"></path> + <path d="M692.121495,101.925234 C711.343069,101.925234 726.925234,86.3430692 726.925234,67.1214953 C726.925234,47.8999214 711.343069,32.317757 692.121495,32.317757 C672.899921,32.317757 657.317757,47.8999214 657.317757,67.1214953 C657.317757,86.3430692 672.899921,101.925234 692.121495,101.925234 Z" id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="6,10"></path> + <path d="M691.5,85.7663551 C702.140514,85.7663551 710.766355,77.1405141 710.766355,66.5 C710.766355,55.8594859 702.140514,47.2336449 691.5,47.2336449 C680.859486,47.2336449 672.233645,55.8594859 672.233645,66.5 C672.233645,77.1405141 680.859486,85.7663551 691.5,85.7663551 Z" id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="6,10"></path> + <path d="M125.5,134 C162.226936,134 192,104.226936 192,67.5 C192,30.7730641 162.226936,1 125.5,1 C88.7730641,1 59,30.7730641 59,67.5 C59,104.226936 88.7730641,134 125.5,134 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M125.5,117.841121 C153.302634,117.841121 175.841121,95.3026337 175.841121,67.5 C175.841121,39.6973663 153.302634,17.1588785 125.5,17.1588785 C97.6973663,17.1588785 75.1588785,39.6973663 75.1588785,67.5 C75.1588785,95.3026337 97.6973663,117.841121 125.5,117.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M126.121495,102.925234 C145.343069,102.925234 160.925234,87.3430692 160.925234,68.1214953 C160.925234,48.8999214 145.343069,33.317757 126.121495,33.317757 C106.899921,33.317757 91.317757,48.8999214 91.317757,68.1214953 C91.317757,87.3430692 106.899921,102.925234 126.121495,102.925234 Z" id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M1123.5,406 C1160.22694,406 1190,376.226936 1190,339.5 C1190,302.773064 1160.22694,273 1123.5,273 C1086.77306,273 1057,302.773064 1057,339.5 C1057,376.226936 1086.77306,406 1123.5,406 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="6,10"></path> + <path d="M1123.5,389.841121 C1151.30263,389.841121 1173.84112,367.302634 1173.84112,339.5 C1173.84112,311.697366 1151.30263,289.158879 1123.5,289.158879 C1095.69737,289.158879 1073.15888,311.697366 1073.15888,339.5 C1073.15888,367.302634 1095.69737,389.841121 1123.5,389.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="6,10"></path> + <path d="M843.5,406 C880.226936,406 910,376.226936 910,339.5 C910,302.773064 880.226936,273 843.5,273 C806.773064,273 777,302.773064 777,339.5 C777,376.226936 806.773064,406 843.5,406 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="4,10"></path> + <path d="M843.5,389.841121 C871.302634,389.841121 893.841121,367.302634 893.841121,339.5 C893.841121,311.697366 871.302634,289.158879 843.5,289.158879 C815.697366,289.158879 793.158879,311.697366 793.158879,339.5 C793.158879,367.302634 815.697366,389.841121 843.5,389.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="4,10"></path> + <path d="M970.5,133 C1007.22694,133 1037,103.226936 1037,66.5 C1037,29.7730641 1007.22694,0 970.5,0 C933.773064,0 904,29.7730641 904,66.5 C904,103.226936 933.773064,133 970.5,133 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="4,7"></path> + <path d="M970.5,116.841121 C998.302634,116.841121 1020.84112,94.3026337 1020.84112,66.5 C1020.84112,38.6973663 998.302634,16.1588785 970.5,16.1588785 C942.697366,16.1588785 920.158879,38.6973663 920.158879,66.5 C920.158879,94.3026337 942.697366,116.841121 970.5,116.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="4,7"></path> + <path d="M971.121495,101.925234 C990.343069,101.925234 1005.92523,86.3430692 1005.92523,67.1214953 C1005.92523,47.8999214 990.343069,32.317757 971.121495,32.317757 C951.899921,32.317757 936.317757,47.8999214 936.317757,67.1214953 C936.317757,86.3430692 951.899921,101.925234 971.121495,101.925234 Z" id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="4,7"></path> + <path d="M970.5,85.7663551 C981.140514,85.7663551 989.766355,77.1405141 989.766355,66.5 C989.766355,55.8594859 981.140514,47.2336449 970.5,47.2336449 C959.859486,47.2336449 951.233645,55.8594859 951.233645,66.5 C951.233645,77.1405141 959.859486,85.7663551 970.5,85.7663551 Z" id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="4,7"></path> + <path d="M346.5,268 C383.226936,268 413,238.226936 413,201.5 C413,164.773064 383.226936,135 346.5,135 C309.773064,135 280,164.773064 280,201.5 C280,238.226936 309.773064,268 346.5,268 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M346.5,251.841121 C374.302634,251.841121 396.841121,229.302634 396.841121,201.5 C396.841121,173.697366 374.302634,151.158879 346.5,151.158879 C318.697366,151.158879 296.158879,173.697366 296.158879,201.5 C296.158879,229.302634 318.697366,251.841121 346.5,251.841121 Z" id="Oval" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M347.121495,236.925234 C366.343069,236.925234 381.925234,221.343069 381.925234,202.121495 C381.925234,182.899921 366.343069,167.317757 347.121495,167.317757 C327.899921,167.317757 312.317757,182.899921 312.317757,202.121495 C312.317757,221.343069 327.899921,236.925234 347.121495,236.925234 Z" id="Oval-Copy" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M346.5,220.766355 C357.140514,220.766355 365.766355,212.140514 365.766355,201.5 C365.766355,190.859486 357.140514,182.233645 346.5,182.233645 C335.859486,182.233645 327.233645,190.859486 327.233645,201.5 C327.233645,212.140514 335.859486,220.766355 346.5,220.766355 Z" id="Oval-Copy-2" stroke="#FFFFFF" stroke-width="4" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-dasharray="1,7"></path> + <path d="M1123,135 L1258,135 C1258,172.279221 1227.77922,202.5 1190.5,202.5 C1153.22078,202.5 1123,172.279221 1123,135 Z" id="Combined-Shape-Copy-6" stroke="none" fill-opacity="0.2" fill="#FFFFFF" fill-rule="evenodd"></path> + <path d="M1123,202.5 L1258,202.5 C1258,239.779221 1227.77922,270 1190.5,270 C1153.22078,270 1123,239.779221 1123,202.5 Z" id="Combined-Shape-Copy-7" stroke="#FFFFFF" stroke-width="1" fill="#FFFFFF" fill-rule="evenodd"></path> + <path d="M217,273 L352,273 C352,310.279221 321.779221,340.5 284.5,340.5 C247.220779,340.5 217,310.279221 217,273 Z" id="Combined-Shape-Copy-6" stroke="none" fill-opacity="0.2" fill="#FFFFFF" fill-rule="evenodd"></path> + <path d="M342,0 L477,0 C477,37.2792206 446.779221,67.5 409.5,67.5 C372.220779,67.5 342,37.2792206 342,0 Z" id="Combined-Shape-Copy-6" stroke="#FFFFFF" stroke-width="1" fill="#FFFFFF" fill-rule="evenodd"></path> + <path d="M342,70 L477,70 C477,107.279221 446.779221,137.5 409.5,137.5 C372.220779,137.5 342,107.279221 342,70 Z" id="Combined-Shape-Copy-7" stroke="none" fill-opacity="0.2" fill="#FFFFFF" fill-rule="evenodd"></path> + <path d="M842,127 L977,127 C977,164.279221 946.779221,194.5 909.5,194.5 C872.220779,194.5 842,164.279221 842,127 Z" id="Combined-Shape-Copy-2" stroke="#FFFFFF" stroke-width="1" fill="#FFFFFF" fill-rule="evenodd" transform="translate(909.500000, 160.750000) scale(1, -1) translate(-909.500000, -160.750000) "></path> + <path d="M842,197.5 L977,197.5 C977,234.779221 946.779221,265 909.5,265 C872.220779,265 842,234.779221 842,197.5 Z" id="Combined-Shape-Copy-3" stroke="none" fill-opacity="0.2" fill="#FFFFFF" fill-rule="evenodd" transform="translate(909.500000, 231.250000) scale(1, -1) translate(-909.500000, -231.250000) "></path> + <path d="M525.556061,168.75 L659.165152,168.75 C659.165152,206.029221 629.255738,236.25 592.360606,236.25 C555.465474,236.25 525.556061,206.029221 525.556061,168.75 Z" id="Combined-Shape-Copy-4" stroke="none" fill-opacity="0.2" fill="#FFFFFF" fill-rule="evenodd" transform="translate(592.360606, 202.500000) scale(-1, -1) rotate(90.000000) translate(-592.360606, -202.500000) "></path> + <path d="M595.834848,168.75 L729.443939,168.75 C729.443939,206.029221 699.534526,236.25 662.639394,236.25 C625.744262,236.25 595.834848,206.029221 595.834848,168.75 Z" id="Combined-Shape-Copy-5" stroke="#FFFFFF" stroke-width="1" fill="#FFFFFF" fill-rule="evenodd" transform="translate(662.639394, 202.500000) scale(-1, -1) rotate(90.000000) translate(-662.639394, -202.500000) "></path> + </g> + </g> + </g> + <g id="Browser/about:tor"> + <g id="Browser-Navigation-Bar"> + <g id="WIndow-Frame" fill="#DEDEDE"> + <g id="Window-Frame"> + <use xlink:href="#path-3"></use> + <path stroke="#B2B2B2" stroke-width="1" d="M0.5,38.5 L999.5,38.5 L999.5,4.99884334 C999.5,2.51337929 997.487585,0.5 995.00436,0.5 L4.99563986,0.5 C2.51581493,0.5 0.5,2.51580952 0.5,4.99884334 L0.5,38.5 Z" stroke-linejoin="square"></path> + </g> + </g> + <g id="Toolbar+Tab" fill="#F2F2F2" stroke="#B2B2B2"> + <path d="M0.5,38.5 L0.5,75.5 L999.5,75.5 L999.5,38.5 L328.110432,38.5 L328.110432,1.00125757 C328.110432,0.722868895 327.887049,0.5 327.603235,0.5 L86.0070341,0.5 C85.7272646,0.5 85.4999552,0.726364786 85.5,1.00117603 L85.5061154,38.5 L0.5,38.5 Z"></path> + </g> + <g id="Navigation-Icons" transform="translate(11.000000, 50.000000)"> + <path d="M1.32755237,7.97898471 L6.76592135,13.2975292 C7.1626259,13.6854931 7.80680906,13.6861402 8.19396269,13.3094647 L8.22802757,13.2763218 C8.62000848,12.8949496 8.61380407,12.2705868 8.2219152,11.8893042 L4.22442067,8 L13.4916192,8 C14.0458358,8 14.4951172,7.55613518 14.4951172,7 L14.4951172,7 C14.4951172,6.44771525 14.0537982,6 13.4916192,6 L4.22442067,6 L8.2219152,2.11069582 C8.61727187,1.72603929 8.61518119,1.10035374 8.22802757,0.723678248 L8.19396269,0.690535315 C7.80198178,0.309163191 7.17044428,0.305789709 6.76592135,0.700018913 L1.32755237,6 L1.32755237,6.04528809 L1.05600758,6.30948364 C0.657148233,6.69754804 0.648235506,7.31805325 1.05600758,7.71478916 L1.32755237,7.97898471 Z" id="Back" fill="#6D6D6D"></path> + <path d="M29.1189627,7.98430647 L34.5573317,13.302851 C34.9540362,13.6908149 35.5982194,13.6914619 35.985373,13.3147864 L36.0194379,13.2816435 C36.4114188,12.9002714 36.4052144,12.2759085 36.0133255,11.8946259 L32.015831,8.00532176 L41.284303,8.00532176 C41.8385958,8.00532176 42.2879389,7.56145693 42.2879389,7.00532176 L42.2879389,7.00532176 C42.2879389,6.45303701 41.8465592,6.00532176 41.284303,6.00532176 L32.015831,6.00532176 L36.0133255,2.11601758 C36.4086822,1.73136105 36.4065915,1.10567549 36.0194379,0.729000004 L35.985373,0.695857072 C35.5933921,0.314484948 34.9618546,0.311111466 34.5573317,0.705340669 L29.1189627,6.00532176 L29.1189627,6.05060984 L28.8474179,6.31480539 C28.4485585,6.7028698 28.4396458,7.32337501 28.8474179,7.72011092 L29.1189627,7.98430647 Z" id="Forward-Inactive" fill="#D7D7D7" transform="translate(35.416430, 7.002661) rotate(-180.000000) translate(-35.416430, -7.002661) "></path> + <g id="refresh-16" opacity="0.600000024" transform="translate(55.000000, 0.000000)" fill="#000000" fill-rule="nonzero"> + <path d="M15,0 C14.4477153,0 14,0.44771525 14,1 L14,3.418 C12.2656045,0.514310998 8.70209555,-0.732515434 5.53572911,0.456459347 C2.36936266,1.64543413 0.507243887,4.92959094 1.11270734,8.25719541 C1.71817079,11.5847999 4.61776243,14.0025552 8,14 C9.85757574,14.0052268 11.6400293,13.267039 12.95,11.95 C13.3289722,11.5576211 13.3235524,10.9339152 12.9378186,10.5481814 C12.5520848,10.1624476 11.9283789,10.1570278 11.536,10.536 C9.99125715,12.1095317 7.60041508,12.4905288 5.64309951,11.4750741 C3.68578394,10.4596193 2.62049313,8.28558162 3.01739169,6.11654864 C3.41429024,3.94751567 5.18040527,2.29158019 7.37047725,2.03503148 C9.56054922,1.77848276 11.6615571,2.98141695 12.549,5 L10,5 C9.44771525,5 9,5.44771525 9,6 C9,6.55228475 9.44771525,7 10,7 L15,7 C15.5522847,7 16,6.55228475 16,6 L16,1 C16,0.44771525 15.5522847,0 15,0 Z" id="Shape"></path> + </g> + </g> + <g id="Address-Bar" transform="translate(93.000000, 43.000000)"> + <path d="M0.5,2.99649048 L0.5,25.0035095 C0.5,26.3766525 1.62122926,27.5 2.99699242,27.5 L797.003008,27.5 C798.375694,27.5 799.5,26.3785056 799.5,25.0035095 L799.5,2.99649048 C799.5,1.62334753 798.378771,0.5 797.003008,0.5 L2.99699242,0.5 C1.62430628,0.5 0.5,1.62149435 0.5,2.99649048 Z" id="Address-Bar-Background" stroke="#B7B7B7" fill="#FFFFFF"></path> + <text id="Search-or-enter-addr" opacity="0.300000012" font-family="SFUIText-Regular, SF UI Text" font-size="13" font-weight="normal" fill="#000000"> + <tspan x="113" y="19">Search or enter address</tspan> + </text> + <path d="M106,6 L106,24" id="Line-3" stroke="#979797" opacity="0.400000006" stroke-linecap="square"></path> + <g id="Tor-Browser" transform="translate(27.000000, 7.000000)" fill="#7D4698" font-family="SFUIText-Medium, SF UI Text" font-size="13" font-weight="400" letter-spacing="-0.300000012"> + <text> + <tspan x="0" y="12">Tor Browse</tspan> + <tspan x="67.0146483" y="12">r</tspan> + </text> + </g> + </g> + <g id="Tab-Content" transform="translate(96.000000, 14.000000)"> + <text id="About-Tor-Browser" font-family="SFUIText-Regular, SF UI Text" font-size="12" font-weight="normal" letter-spacing="-0.000427656208" fill="#000000"> + <tspan x="0" y="11">Tor Browser</tspan> + </text> + <path d="M210,6.98984746 L213.780638,3.20920944 C214.059584,2.93026352 214.511845,2.93026352 214.790791,3.20920944 C215.069736,3.48815536 215.069736,3.94041606 214.790791,4.21936199 L211.010153,8 L214.790791,11.780638 C215.069736,12.0595839 215.069736,12.5118446 214.790791,12.7907906 C214.511845,13.0697365 214.059584,13.0697365 213.780638,12.7907906 L210,9.01015254 L206.219362,12.7907906 C205.940416,13.0697365 205.488155,13.0697365 205.209209,12.7907906 C204.930264,12.5118446 204.930264,12.0595839 205.209209,11.780638 L208.989847,8 L205.209209,4.21936199 C204.930264,3.94041606 204.930264,3.48815536 205.209209,3.20920944 C205.488155,2.93026352 205.940416,2.93026352 206.219362,3.20920944 L210,6.98984746 Z" id="Close-Icon" fill="#5A5A5A" fill-rule="nonzero"></path> + </g> + <g id="Streetlights" transform="translate(16.000000, 15.000000)"> + <circle id="close" stroke="#E14640" fill="#FF6059" cx="7.22268727" cy="6.5" r="6"></circle> + <circle id="maximize" stroke="#1DAC2C" fill="#28CA42" cx="50.5057061" cy="6.5" r="6"></circle> + <circle id="minimize" stroke="#DFA023" fill="#FFBD2E" cx="28.8641967" cy="6.5" r="6"></circle> + </g> + <g id="new-16" opacity="0.5" transform="translate(343.000000, 15.000000)" fill="#000000" fill-rule="nonzero"> + <path d="M11.1428571,5.14285714 L6.85714286,5.14285714 L6.85714286,0.857142857 C6.85714286,0.383755929 6.47338693,0 6,0 C5.52661307,0 5.14285714,0.383755929 5.14285714,0.857142857 L5.14285714,5.14285714 L0.857142857,5.14285714 C0.383755929,5.14285714 0,5.52661307 0,6 C-9.51619735e-17,6.47338693 0.383755929,6.85714286 0.857142857,6.85714286 L5.14285714,6.85714286 L5.14285714,11.1428571 C5.14285714,11.6162441 5.52661307,12 6,12 C6.47338693,12 6.85714286,11.6162441 6.85714286,11.1428571 L6.85714286,6.85714286 L11.1428571,6.85714286 C11.6162441,6.85714286 12,6.47338693 12,6 C12,5.52661307 11.6162441,5.14285714 11.1428571,5.14285714 Z" id="Shape"></path> + </g> + <g id="menu-16" transform="translate(966.000000, 43.000000)"> + <rect id=":hover" x="0" y="0" width="28" height="28" rx="3"></rect> + <path d="M9,10 L19,10 C19.5522847,10 20,9.55228475 20,9 C20,8.44771525 19.5522847,8 19,8 L9,8 C8.44771525,8 8,8.44771525 8,9 C8,9.55228475 8.44771525,10 9,10 Z M19,13 L9,13 C8.44771525,13 8,13.4477153 8,14 C8,14.5522847 8.44771525,15 9,15 L19,15 C19.5522847,15 20,14.5522847 20,14 C20,13.4477153 19.5522847,13 19,13 Z M19,18 L9,18 C8.44771525,18 8,18.4477153 8,19 C8,19.5522847 8.44771525,20 9,20 L19,20 C19.5522847,20 20,19.5522847 20,19 C20,18.4477153 19.5522847,18 19,18 Z" id="Shape" fill="#6D6D6D" fill-rule="nonzero"></path> + </g> + <g id="security-indicator-16" transform="translate(937.000000, 42.000000)"> + <path d="M3,0 L22.7011719,0 L25,0 C26.6568542,-3.04359188e-16 28,1.34314575 28,3 L28,25 C28,26.6568542 26.6568542,28 25,28 L3,28 C1.34314575,28 2.02906125e-16,26.6568542 0,25 L-8.8817842e-16,3 C-1.09108455e-15,1.34314575 1.34314575,3.04359188e-16 3,0 Z" id=":hover"></path> + <g id="B-shield-2-" transform="translate(6.000000, 7.000000)" fill="#6D6D6D" fill-rule="nonzero"> + <path d="M8,13.9315843 C10.8656467,13.0576771 13,10.2413541 13,7.27272727 L13,4.24375717 L8,2.16583509 L8,13.9315843 Z M8,0 L15,2.90909091 L15,7.27272727 C15,11.3090909 12.0133333,15.0836364 8,16 C3.98666667,15.0836364 1,11.3090909 1,7.27272727 L1,2.90909091 L8,0 Z" id="Shape"></path> + </g> + </g> + </g> + <g id="tb_icon/Stable" transform="translate(100.000000, 49.000000)"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="8" cy="8" r="7.6875"></circle> + <path d="M8.01641071,14.5449909 L8.01641071,13.5752065 C11.0883185,13.5663359 13.5756501,11.0739036 13.5756501,7.99977823 C13.5756501,4.92587459 11.0883185,2.43344237 8.01641071,2.42457171 L8.01641071,1.45478738 C11.6238842,1.4638798 14.5452126,4.39030881 14.5452126,7.99977823 C14.5452126,11.6094694 11.6238842,14.5361202 8.01641071,14.5449909 L8.01641071,14.5449909 Z M8.01641071,11.1506348 C9.74907135,11.1415424 11.1515219,9.73487831 11.1515219,7.99977823 C11.1515219,6.26489993 9.74907135,4.85823585 8.01641071,4.84914343 L8.01641071,3.87958086 C10.2848589,3.88845152 12.1213062,5.72933415 12.1213062,7.99977823 C12.1213062,10.2704441 10.2848589,12.1113267 8.01641071,12.1201974 L8.01641071,11.1506348 Z M8.01641071,6.30370904 C8.94583356,6.3125797 9.69695626,7.06813772 9.69695626,7.99977823 C9.69695626,8.93164052 8.94583356,9.68719854 8.01641071,9.69606919 L8.01641071,6.30370904 Z M0,7.99977823 C0,12.4182514 3.58152686,16 8,16 C12.4182514,16 16,12.4182514 16,7.99977823 C16,3.58152686 12.4182514,0 8,0 C3.58152686,0 0,3.58152686 0,7.99977823 Z" id="center" fill="url(#linearGradient-4)"></path> + <g id="half" transform="translate(4.390625, 8.093750) scale(-1, 1) translate(-4.390625, -8.093750) "> + <use fill="black" fill-opacity="1" filter="url(#filter-7)" xlink:href="#path-6"></use> + <use fill="url(#linearGradient-5)" fill-rule="evenodd" xlink:href="#path-6"></use> + </g> + </g> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> \ No newline at end of file diff --git a/assets/static/images/tb85/tb85.png b/assets/static/images/tb85/tb85.png index af7039a..b977d06 100644 Binary files a/assets/static/images/tb85/tb85.png and b/assets/static/images/tb85/tb85.png differ diff --git a/assets/static/images/tb85/tb85(a)2x.png b/assets/static/images/tb85/tb85(a)2x.png index 2e3914f..75744ae 100644 Binary files a/assets/static/images/tb85/tb85(a)2x.png and b/assets/static/images/tb85/tb85(a)2x.png differ

1 0

[tpo/staging] Merge branch 'master' of git-rw.torproject.org:project/web/tpo
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 3091c213ceb8690f24902fb3c50e8966f836ec98 Merge: 6a46ed8 b5bf68c Author: hiro <hiro(a)torproject.org> Date: Tue Mar 26 21:40:07 2019 +0100 Merge branch 'master' of git-rw.torproject.org:project/web/tpo content/about/people/pospeselr/contents.lr | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tpo/staging] a couple more of redirects, thanks haakonn for reporting
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 442a67e184a83cb2b0a1f03858c5c194931fe887 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 27 09:41:11 2019 +0100 a couple more of redirects, thanks haakonn for reporting --- .htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.htaccess b/.htaccess index 5895b5c..bdf2262 100644 --- a/.htaccess +++ b/.htaccess @@ -39,6 +39,7 @@ RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRe # GetInvolved RewriteRule ^getinvolved/$ https://2019.www.torproject.org/getinvolved/volunteer [R=302,L] +RewriteRule ^getinvolved(.*) https://2019.www.torproject.org/getinvolved$1 [R=302,L] RewriteRule ^volunteer(.*) https://2019.www.torproject.org/getinvolved/volunteer$1 [R=302,L] RewriteRule ^tshirt(.*) https://2019.www.torproject.org/getinvolved/tshirt$1 [R=302,L] @@ -60,6 +61,7 @@ RewriteRule ^about/contact(.*) /contact$1 [R=301,L] RewriteRule ^download/download/$ /download [R=301,L] RewriteRule ^download/download.html(.*) /download [R=301,L] RewriteRule ^download/easy-download(.*) /download [R=301,L] +RewriteRule ^download/download-easy(.*) /download [R=302,L] # Relays RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L]

1 0

[tpo/staging] add link found at https://support.torproject.org/tbb/how-to-verify-signature/
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit a84acfef7de318f52ab9b44bf17b42e540ecc486 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 27 08:47:05 2019 +0100 add link found at https://support.torproject.org/tbb/how-to-verify-signature/ --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 0f902e5..5895b5c 100644 --- a/.htaccess +++ b/.htaccess @@ -6,6 +6,7 @@ RewriteRule ^docs/bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R= RewriteRule ^docs/abuse(.*) https://2019.www.torproject.org/docs/abuse$1 [R=302,L] RewriteRule ^docs/documentation(.*) https://2019.www.torproject.org/docs/documentation$1 [R=302,L] RewriteRule ^docs/verifying-signatures(.*) https://2019.www.torproject.org/docs/verifying-signatures$1 [R=302,L] +RewriteRule ^docs/signing-keys(.*) https://2019.www.torproject.org/docs/signing-keys$1 [R=302,L] RewriteRule ^docs/tor-manual(.*) https://2019.www.torproject.org/docs/tor-manual$1 [R=302,L] # Torbutton

1 0

[tpo/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 0b5305c93538d9aaba103bbdcf66b090eeb4d7a3 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 10:23:48 2019 +0100 Update htaccess --- .htaccess | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index bdf2262..218680a 100644 --- a/.htaccess +++ b/.htaccess @@ -61,7 +61,11 @@ RewriteRule ^about/contact(.*) /contact$1 [R=301,L] RewriteRule ^download/download/$ /download [R=301,L] RewriteRule ^download/download.html(.*) /download [R=301,L] RewriteRule ^download/easy-download(.*) /download [R=301,L] +<<<<<<< HEAD RewriteRule ^download/download-easy(.*) /download [R=302,L] +======= +RewriteRule ^download/download-easy(.*) /download [R=301,L] +>>>>>>> Update htaccess # Relays RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L]

1 0