sponsor update

content/about/sponsors/DARPA-penn/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2018 - 2019
+time: 2018 - Present
 ---
 name: DARPA via University of Pennsylvania
 ---
+key: 13
+---
 logo: /static/images/sponsors/darpa.png
 ---
 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. This grant supports our work addressing denial of service attacks on free and open communication on the internet.

content/about/sponsors/USSD-DHRL-harvard/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2017 - 2019
+time: 2017 - Present
 ---
 name: U.S. Department of State Bureau of Democracy, Human Rights, and Labor via Harvard
 ---
+key: 12
+---
 logo: /static/images/sponsors/USSD.png
 ---
 link: https://www.state.gov/j/drl/
 ---
 description:
 
-The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote [democracy](http://www.state.gov/j/drl/democ/), protect [human rights](http://www.state.gov/j/drl/hr/) and [international religious freedom](http://www.state.gov/j/drl/irf/), and advance [labor rights](http://www.state.gov/j/drl/ila/index.htm) globally.
+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.

content/about/sponsors/USSD-DHRL/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2013 - 2019
+time: 2017 - 2018
 ---
 name: U.S. Department of State Bureau of Democracy, Human Rights, and Labor
 ---
+key: 11
+---
 logo: /static/images/sponsors/USSD.png
 ---
 link: https://www.state.gov/j/drl/
 ---
 description:
 
-The Bureau of Democracy, Human Rights and Labor leads the U.S. efforts to promote [democracy](http://www.state.gov/j/drl/democ/), protect [human rights](http://www.state.gov/j/drl/hr/) and [international religious freedom](http://www.state.gov/j/drl/irf/), and advance [labor rights](http://www.state.gov/j/drl/ila/index.htm) globally.
+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. We used this funding to develop and deploy Tor Browser for Android.

content/about/sponsors/contents.lr

@@ -12,4 +12,4 @@ title: Sponsors
 ---
 body:
 
-Having a diverse user base means we have diverse funding sources, too.  We want to continue diversifying our funding. To inquire about sponsorship, please email giving(at)torproject.org.
+Having a diverse user base means we have diverse funding sources, too. Our goal is to continue diversifying our funding. To inquire about sponsorship, please email giving(at)torproject.org.

content/about/sponsors/cymru/contents.lr

@@ -6,10 +6,12 @@ time: 2009 - Present
 ---
 name: Team Cymru
 ---
+key: 15
+---
 logo: /static/images/sponsors/cymru.png
 ---
 link: https://www.team-cymru.org/
 ---
 description:
 
-Team Cymru has over a decade of experience and expertise at providing unparalleled threat intelligence and insight for security vendors, network defenders, incident response teams, and analysts.
+Team Cymru has over a decade of experience and expertise at providing unparalleled threat intelligence and insight for security vendors, network defenders, incident response teams, and analysts. Cymru generously donated hardware to us that they keep hosted on their racks.

content/about/sponsors/fastly/contents.lr

@@ -2,12 +2,15 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2016 - 2018
+time: 2016 - Present
 ---
 name: Fastly
 ---
+key: 11
+---
 logo: /static/images/sponsors/fastly.png
 ---
 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 generously hosts our Tor Browser update downloads that can be fetched anonymously.

content/about/sponsors/handshake/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2010 - 2013, 2017 - 2020
+time: 2018
 ---
 name: The Handshake Foundation
 ---
+key: 07
+---
 logo: /static/images/sponsors/handshake.png
 ---
 link: https://handshake.org/
 ---
 description:
 
-Handshake is a decentralized, permissionless naming protocol compatible with DNS where every peer is validating and in charge of managing the root zone with the goal of creating an alternative to existing Certificate Authorities. Its purpose is not to replace the DNS protocol, but to replace the root zone file and the root servers with a public commons.
+Handshake is a decentralized, permissionless naming protocol compatible with DNS where every peer is validating and in charge of managing the root zone with the goal of creating an alternative to existing Certificate Authorities. This grant was unrestricted, general operating funds for the Tor Project.

content/about/sponsors/imls-ny/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2017 - 2020
+time: 2017 - Present
 ---
 name: Institute of Museum and Library Services via New York University
 ---
+key: 14
+---
 logo: /static/images/sponsors/imls.png
 ---
 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.
+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.

content/about/sponsors/individuals/contents.lr

@@ -6,11 +6,12 @@ time: 2006 - Present
 ---
 name: Tens of thousands of individuals like you
 ---
+key: 01
+---
 logo: /static/images/sponsors/artwork.png
 ---
 link: https://www.torproject.org/donate/donate.html.en
 ---
 description:
 
-Donations from individuals allow us to easily allocate resources to emergent events that require our response and to reorder our priorities whenever needed.
-This is extremely important for any software development organization, especially one that provides essential safety to people in volatile locations like Tor.
+Donations from individuals allow us to easily allocate resources to emergent events that require our response. This is extremely important for our work providing essential safety to people in volatile locations.

content/about/sponsors/mdf/contents.lr

@@ -6,10 +6,12 @@ time: 2016 - 2018
 ---
 name: Media Democracy Fund
 ---
+key: 06
+---
 logo: /static/images/sponsors/mdf.png
 ---
 link: http://mediademocracyfund.org/
 ---
 description:
 
-MDF’s deep expertise in media and technology policy and partnerships with public interest and civil society organizations around the world enable them to guide their funding partners through the rapidly changing issues and develop strategies that address priorities in digital equity and rights.
+MDF expertise in media and technology policy and extensive partnerships enable them to guide their funding partners through the rapidly changing issues and develop strategies that address priorities in digital equity and rights. These grants were unrestricted, general operating funds for both the Tor Project and the Open Observatory of Network Interference (OONI).

content/about/sponsors/mozilla/contents.lr

@@ -2,15 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2016 - 2018
+time: 2016 - Present
 ---
 name: Mozilla
 ---
+key: 03
+---
 logo: /static/images/sponsors/mozilla.png
 ---
 link: https://www.mozilla.org/en-US/moss/
 ---
 description:
 
-Mozilla was born out of and remains part of the open source and free software movement.
-Through the Mozilla Open Source Support (MOSS) awards program, Mozilla recognizes, celebrates, and supports open source projects that contribute to Mozilla’s work and to the health of the Internet.
+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.

content/about/sponsors/nsf-georgetown/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2015 - 2019
+time: 2015 - Present
 ---
 name: National Science Foundation joint with Georgetown
 ---
-logo: /static/images/sponsors/nsf.png
+key: 09
+---
+logo: /static/images/sponsors/nsf-georgetown.png
 ---
 link: https://nsf.gov/
 ---
 description:
 
-The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research.
+The National Science Foundation funds research and education in most fields of science and engineering. We are using this grant to study how internet infrastructure attacks apply to anonymity networks, design defenses that improve the resilience against such threats, and transition such defenses to the deployed Tor network.

content/about/sponsors/nsf-illinois-chicago/contents.lr

@@ -1,10 +1,10 @@
 _model: sponsor
 ---
-active: True
+active: False
 ---
 time: 2016 - 2018
 ---
-name: National Science Foundation joint with University of Illinois at Chicago 
+name: National Science Foundation joint with University of Illinois at Chicago
 ---
 logo: /static/images/sponsors/nsf.png
 ---

content/about/sponsors/nsf-minnesota/contents.lr

@@ -6,10 +6,12 @@ time: 2013 - 2018
 ---
 name: National Science Foundation via University of Minnesota
 ---
-logo: /static/images/sponsors/nsf.png
+key: 08
+---
+logo: /static/images/sponsors/nsf-minnesota.png
 ---
 link: https://nsf.gov/
 ---
 description:
 
-The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research.
+The National Science Foundation funds research and education in most fields of science and engineering. This grant helped us investigate measurement-based design and analysis of censorship circumvention schemes.

content/about/sponsors/nsf-princeton/contents.lr

@@ -1,6 +1,6 @@
 _model: sponsor
 ---
-active: True
+active: False
 ---
 time: 2012 - 2018
 ---

content/about/sponsors/nsf-rice/contents.lr

@@ -1,6 +1,6 @@
 _model: sponsor
 ---
-active: True
+active: False
 ---
 time: 2006 - 2007
 ---

content/about/sponsors/nsf-rochester/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2016 - 2019
+time: 2016 - Present
 ---
 name: National Science Foundation joint with Rochester Institute of Technology
 ---
-logo: /static/images/sponsors/nsf.png
+key: 10
+---
+logo: /static/images/sponsors/nsf-rit.png
 ---
 link: https://nsf.gov/
 ---
 description:
 
-The National Science Foundation funds research and education in most [fields of science and engineering](https://nsf.gov/funding/index.jsp#areas). It does this through grants, and cooperative agreements to more than 2,000 colleges, universities, K-12 school systems, businesses, informal science organizations and other research organizations throughout the United States. The Foundation accounts for about one-fourth of federal support to academic institutions for basic research.
+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.

content/about/sponsors/otf/contents.lr

@@ -2,15 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2012 - 2019
+time: 2012 - Present
 ---
 name: Open Technology Fund
 ---
+key: 04
+---
 logo: /static/images/sponsors/OTF.png
 ---
 link: https://www.opentech.fund/
 ---
 description:
 
-OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights.
-The daily suppression of free expression and information limits everyone's ability to take full advantage of the powerful communications platform that the internet has become.
+OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These grants were used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement.

content/about/sponsors/rose/contents.lr

@@ -2,14 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2017 - 2019
+time: 2018
 ---
 name: Rose Foundation for Communities and the Environment
 ---
+key: 02
+---
 logo: /static/images/sponsors/rose.png
 ---
 link: https://rosefdn.org/
 ---
 description:
 
-The Rose Foundation builds and maintains a bridge between the community and organized philanthropy; protects the natural environment, public health, and community and consumer rights; promotes collaboration between labor, environmental, business, consumer and social interests; cultivates a new generation of environmental stewards and social policy leaders; respects the inalienable rights protected by our nation’s constitution, and the essential human rights to clean air, clean water, and individual dignity and privacy.
+The Rose Foundation builds and maintains a bridge between the community and organized philanthropy and protects the essential human rights to clean air, clean water, and individual dignity and privacy. These funds helped to improve Tor software and increase public awareness of how to use Tor to protect consumer privacy.

content/about/sponsors/sida/contents.lr

@@ -2,15 +2,16 @@ _model: sponsor
 ---
 active: True
 ---
-time: 2010 - 2013, 2017 - 2020
+time: 2017 - Present
 ---
 name: Sida - Swedish International Development Cooperation Agency
 ---
+key: 05
+---
 logo: /static/images/sponsors/sida.png
 ---
 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.
+Sida is a government agency working on behalf of the Swedish parliament and government to help implement Sweden’s Policy for Global Development, with the mission to reduce poverty in the world. We are using this grant to improve usability and community training in support of democracy and human rights in Uganda and Colombia.

models/sponsor.ini

@@ -28,3 +28,7 @@ type = string
 [fields.time]
 label = Time
 type = string
+
+[fields.key]
+label = Key
+type = string

models/sponsors.ini

@@ -25,4 +25,4 @@ type = string
 
 [children]
 model = sponsor
-order_by = name
+order_by = key

templates/history.html

@@ -1,4 +1,4 @@
-<div class="container py-3 content">
+<div class="container py-3 mt-5 content">
   <div class="w-75">
     {% block body %}
       {{ this.body }}

templates/macros/sponsors.html

@@ -1,6 +1,6 @@
 {% macro render_active(item, alternative) %}
-<div class="col-4">
-<div class="card border-1">
+<div class="col-3 my-2">
+<div class="card border-1 h-100">
   <img class="card-img-top" src="{{ item.logo|asseturl }}" alt="Card image cap">
   <div class="card-body">
     <h4><a href="{{ item.link }}">{{ item.name }}</a></h4>

templates/sponsors.html

@@ -1,7 +1,10 @@
+<div class="container">
+  <p> Thank you to all the people and groups who have made Tor possible so far, and thank you especially to the individual volunteers who have made non-financial contributions: coding, testing, documenting, educating, researching, and running the relays that make up the Tor network.</p>
+</div>
 <div class="container py-3">
 <h3 class="text-primary display-5">Active Sponsors</h3>
 </div>
-<div class="container">
+<div class="fluid-container">
   <div class="row">
     {% from "macros/sponsors.html" import render_active %}
     {% set items = this.children %}
@@ -15,7 +18,7 @@
 </div>
 <div class="container">
 <div class="row">
-  <div class="col-8">
+  <div class="col-12">
     <ul class="jobs-ul">
       {% set items = this.children %}
       {% for item in items.filter(F.active == False) %}
@@ -26,7 +29,10 @@
 </div>
 </div>
 <div class="container">
-  <div class="row">
-    <p>This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data. Further details about our audited and reviewed funding can be found on our Financial Reports page.</p>
+  <div class="container">
+    <div class="row border-bottom border-light"><p></p></div>
+    <div class="row py-5">
+      <p>This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data. Further details about our audited and reviewed funding can be found on our <a href="/about/reports" title="Reports" >Financial Reports page.</a></p>
+    </div>
   </div>
 </div>