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

[meek/utls_2] Update meek-client.1 with uTLS proxy support.
by dcf＠torproject.org 02 Feb '19

02 Feb '19

commit e4bc7b1c3aae41252f64b3affc8c08e525831e08 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Feb 1 20:56:27 2019 -0700 Update meek-client.1 with uTLS proxy support. Was aiming for parity with net/http. --- doc/meek-client.1 | 11 +++++++---- doc/meek-client.1.txt | 12 +++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/meek-client.1 b/doc/meek-client.1 index 1ca6640..635cb7f 100644 --- a/doc/meek-client.1 +++ b/doc/meek-client.1 @@ -2,12 +2,12 @@ .\" Title: meek-client .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/> -.\" Date: 01/31/2019 +.\" Date: 02/01/2019 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MEEK\-CLIENT" "1" "01/31/2019" "\ \&" "\ \&" +.TH "MEEK\-CLIENT" "1" "02/01/2019" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -238,9 +238,12 @@ A global proxy (applies to all Bridge lines) can be configured using special tor .RS 4 .\} .nf -HTTPSProxy localhost:8080 Socks4Proxy localhost:1080 Socks5Proxy localhost:1080 +Socks5ProxyUsername username +Socks5ProxyPassword password +HTTPSProxy localhost:8080 +HTTPSProxyAuthenticator username:password .fi .if n \{\ .RE @@ -248,7 +251,7 @@ Socks5Proxy localhost:1080 .sp or, equivalently, using the \fB\-\-proxy\fR command line option\&. The command line option takes precedence\&. .sp -When the \fB\-\-helper\fR option is used, you can use proxies of type http, socks4a, or socks5\&. Without \fB\-\-helper\fR and with \fButls\fR, you cannot use a proxy\&. Without \fB\-\-helper\fR and without \fButls\fR, you can use proxies of type http, https, or socks5\&. +When the \fB\-\-helper\fR option is used, you can use proxies of type http, socks4a, or socks5, but you cannot use a username or password with the proxy\&. Without \fB\-\-helper\fR, you can use proxies of type http, https, or socks5, and you can optionally use a username and password\&. .SH "OPTIONS" .PP \fB\-\-front\fR=\fIDOMAIN\fR diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt index 89d1265..33e2916 100644 --- a/doc/meek-client.1.txt +++ b/doc/meek-client.1.txt @@ -93,18 +93,20 @@ extension, which must be set up separately. A global proxy (applies to all Bridge lines) can be configured using special torrc options: ---- -HTTPSProxy localhost:8080 Socks4Proxy localhost:1080 Socks5Proxy localhost:1080 +Socks5ProxyUsername username +Socks5ProxyPassword password +HTTPSProxy localhost:8080 +HTTPSProxyAuthenticator username:password ---- or, equivalently, using the **--proxy** command line option. The command line option takes precedence. When the **--helper** option is used, you can use proxies of type -http, socks4a, or socks5. -Without **--helper** and with **utls**, you cannot use a proxy. -Without **--helper** and without **utls**, you can use proxies of type -http, https, or socks5. +http, socks4a, or socks5, but you cannot use a username or password with the proxy. +Without **--helper**, you can use proxies of type +http, https, or socks5, and you can optionally use a username and password. OPTIONS -------

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 01 Feb '19

01 Feb '19

commit d89edc180eedc019c056be4a8b98297627d710c5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 1 21:46:29 2019 +0000 Update translations for mat-gui_completed --- sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk.po b/sk.po index 267f4c461..e698e3839 100644 --- a/sk.po +++ b/sk.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2019-01-15 12:23+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-02-01 20:47+0000\n" +"Last-Translator: Juraj Cigáň <kusavica(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 01 Feb '19

01 Feb '19

commit fcf20a26fd3b00e3f6d3ac08c7ec33298caba7cf Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 1 21:46:23 2019 +0000 Update translations for mat-gui --- sk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sk.po b/sk.po index 267f4c461..e698e3839 100644 --- a/sk.po +++ b/sk.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2019-01-15 12:23+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-02-01 20:47+0000\n" +"Last-Translator: Juraj Cigáň <kusavica(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 01 Feb '19

01 Feb '19

commit ca8e3eb5a0974d03168d215cc5942a8b7e14b0d8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 1 21:45:34 2019 +0000 Update translations for donatepages-messagespot --- locale/sk/LC_MESSAGES/messages.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/locale/sk/LC_MESSAGES/messages.po b/locale/sk/LC_MESSAGES/messages.po index 35538be4c..b4d9db7b5 100644 --- a/locale/sk/LC_MESSAGES/messages.po +++ b/locale/sk/LC_MESSAGES/messages.po @@ -2,10 +2,11 @@ # Daša Matúšová, 2018 # Roman 'Kaktuxista' Benji <romanbeno273(a)gmail.com>, 2018 # erinm, 2019 +# Juraj Cigáň <kusavica(a)gmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Juraj Cigáň <kusavica(a)gmail.com>, 2019\n" "Language-Team: Slovak (https://www.transifex.com/otf/teams/1519/sk/)\n" "Language: sk\n" "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n" @@ -374,12 +375,12 @@ msgstr "Mesto" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:389 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:383 msgid "State" -msgstr "Stav" +msgstr "Štát" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:394 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:388 msgid "Zip" -msgstr "" +msgstr "PSČ" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:400 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:394

1 0

[tor-browser-build/master] Bug 29235: Build our own version of python3.6
by gk＠torproject.org 01 Feb '19

01 Feb '19

commit 66a0ab022c3c539a3756771cf72e793fa2e861e7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jan 30 20:54:51 2019 +0100 Bug 29235: Build our own version of python3.6 The build of HTTPS-Everywhere requires python3.6, however the python3.6 package which we were using has now been removed from Debian Unstable. We now build python 3.6 ourselves. As the different platforms use a different suite by default, we add the common-stretch target to rbm.conf, which we use to avoid building a different python for each platform. --- keyring/python.gpg | Bin 0 -> 4302 bytes projects/debootstrap-image/config | 7 ------- projects/https-everywhere/build | 1 + projects/https-everywhere/config | 9 ++++++--- projects/python/build | 14 ++++++++++++++ projects/python/config | 25 +++++++++++++++++++++++++ rbm.conf | 17 +++++++++++++++++ 7 files changed, 63 insertions(+), 10 deletions(-) diff --git a/keyring/python.gpg b/keyring/python.gpg new file mode 100644 index 0000000..66711fd Binary files /dev/null and b/keyring/python.gpg differ diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index c916e9f..7e8b280 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -100,13 +100,6 @@ targets: suite: jessie arch: i386 - buster-amd64: - var: - minimal_apt_version: '1.8.0~alpha3.1' - container: - suite: buster - arch: amd64 - stretch-amd64: var: minimal_apt_version: 1.4.9 diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 10dd4bf..88431e0 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -1,5 +1,6 @@ #!/bin/bash [% c("var/set_default_env") -%] +[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] ./make.sh diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 59eb463..1be120b 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,18 +10,17 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to buster/amd64 for all platforms. This allows us to create only one + # to stretch/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: buster + suite: stretch arch: amd64 deps: - git - - python3.6 - libxslt1.1 - libxml2-utils - sqlite3 @@ -31,3 +30,7 @@ var: input_files: - project: container-image + - project: python + name: python + target: + - common-stretch diff --git a/projects/python/build b/projects/python/build new file mode 100644 index 0000000..1fff7ce --- /dev/null +++ b/projects/python/build @@ -0,0 +1,14 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir +tar xf [% c('input_files_by_name/python') %] +cd Python-[% c('version') %] +./configure --prefix=$distdir +make -j[% c("buildconf/num_procs") %] +make prefix=$distdir install +cd /var/tmp/dist +[% c('tar', { + tar_src => 'python', + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/python/config b/projects/python/config new file mode 100644 index 0000000..10c79cc --- /dev/null +++ b/projects/python/config @@ -0,0 +1,25 @@ +# vim: filetype=yaml sw=2 +version: 3.6.8 +filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/release") %]-[% c("var/build_id") %].tar.gz' +var: + container: + use_container: 1 + deps: + - xz-utils + - build-essential + - python-all + - zlib1g-dev + - libssl-dev + + setup: | + mkdir -p /var/tmp/dist + tar -C /var/tmp/dist -xf $rootdir/[% c("python_tarfile") %] + export PATH=/var/tmp/dist/python/bin:"$PATH" + +input_files: + - project: container-image + - name: python + URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz' + gpg_keyring: python.gpg + sig_ext: asc + file_gpg_id: 1 diff --git a/rbm.conf b/rbm.conf index 810eae8..381eab6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -140,6 +140,23 @@ targets: # Don't create mar files to save time build_mar: 0 + # The common-stretch target is used to build components that are common to all + # platforms, using Debian stretch. + common-stretch: + var: + common: 1 + container: + suite: stretch + arch: amd64 + deps: + - build-essential + - python + - bison + - automake + - libtool + - zip + - unzip + torbrowser-android-armv7: - android-armv7 android-armv7:

1 0

[tpo/staging] sponsor update
by hiro＠torproject.org 01 Feb '19

01 Feb '19

commit 7a4ddb3abe7aeb98f09351372b93b6223d986601 Author: Antonela <hola(a)antonela.me> Date: Fri Feb 1 13:12:11 2019 +0100 sponsor update --- assets/static/images/sponsors/darpa.png | Bin 127422 -> 147898 bytes assets/static/images/sponsors/nsf-georgetown.png | Bin 0 -> 89533 bytes assets/static/images/sponsors/nsf-minnesota.png | Bin 0 -> 83004 bytes assets/static/images/sponsors/nsf-rit.png | Bin 0 -> 76449 bytes content/about/sponsors/DARPA-penn/contents.lr | 6 ++++-- .../about/sponsors/USSD-DHRL-harvard/contents.lr | 6 ++++-- content/about/sponsors/USSD-DHRL/contents.lr | 6 ++++-- content/about/sponsors/contents.lr | 2 +- content/about/sponsors/cymru/contents.lr | 4 +++- content/about/sponsors/fastly/contents.lr | 5 ++++- content/about/sponsors/handshake/contents.lr | 6 ++++-- content/about/sponsors/imls-ny/contents.lr | 6 ++++-- content/about/sponsors/individuals/contents.lr | 5 +++-- content/about/sponsors/mdf/contents.lr | 4 +++- content/about/sponsors/mozilla/contents.lr | 7 ++++--- content/about/sponsors/nsf-georgetown/contents.lr | 8 +++++--- .../sponsors/nsf-illinois-chicago/contents.lr | 4 ++-- content/about/sponsors/nsf-minnesota/contents.lr | 6 ++++-- content/about/sponsors/nsf-princeton/contents.lr | 2 +- content/about/sponsors/nsf-rice/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 8 +++++--- content/about/sponsors/otf/contents.lr | 7 ++++--- content/about/sponsors/rose/contents.lr | 6 ++++-- content/about/sponsors/sida/contents.lr | 7 ++++--- models/sponsor.ini | 4 ++++ models/sponsors.ini | 2 +- templates/history.html | 2 +- templates/macros/sponsors.html | 4 ++-- templates/sponsors.html | 14 ++++++++++---- 29 files changed, 86 insertions(+), 47 deletions(-) diff --git a/assets/static/images/sponsors/darpa.png b/assets/static/images/sponsors/darpa.png index 8a6e79c..8d4bb81 100644 Binary files a/assets/static/images/sponsors/darpa.png and b/assets/static/images/sponsors/darpa.png differ diff --git a/assets/static/images/sponsors/nsf-georgetown.png b/assets/static/images/sponsors/nsf-georgetown.png new file mode 100644 index 0000000..290c58e Binary files /dev/null and b/assets/static/images/sponsors/nsf-georgetown.png differ diff --git a/assets/static/images/sponsors/nsf-minnesota.png b/assets/static/images/sponsors/nsf-minnesota.png new file mode 100644 index 0000000..b3979f3 Binary files /dev/null and b/assets/static/images/sponsors/nsf-minnesota.png differ diff --git a/assets/static/images/sponsors/nsf-rit.png b/assets/static/images/sponsors/nsf-rit.png new file mode 100644 index 0000000..566bc9f Binary files /dev/null and b/assets/static/images/sponsors/nsf-rit.png differ diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index a54e527..4eb1e31 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/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. diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr index 4d43285..efde019 100644 --- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr +++ b/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. diff --git a/content/about/sponsors/USSD-DHRL/contents.lr b/content/about/sponsors/USSD-DHRL/contents.lr index 0d19722..75b30fa 100644 --- a/content/about/sponsors/USSD-DHRL/contents.lr +++ b/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. diff --git a/content/about/sponsors/contents.lr b/content/about/sponsors/contents.lr index 2d54703..9434ab9 100644 --- a/content/about/sponsors/contents.lr +++ b/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. diff --git a/content/about/sponsors/cymru/contents.lr b/content/about/sponsors/cymru/contents.lr index 3a4d4d5..8cf5c69 100644 --- a/content/about/sponsors/cymru/contents.lr +++ b/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. diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index bbd1e20..1338382 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/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. diff --git a/content/about/sponsors/handshake/contents.lr b/content/about/sponsors/handshake/contents.lr index b39a8b8..97537b9 100644 --- a/content/about/sponsors/handshake/contents.lr +++ b/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. diff --git a/content/about/sponsors/imls-ny/contents.lr b/content/about/sponsors/imls-ny/contents.lr index 1243e54..f4d7db7 100644 --- a/content/about/sponsors/imls-ny/contents.lr +++ b/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. diff --git a/content/about/sponsors/individuals/contents.lr b/content/about/sponsors/individuals/contents.lr index 1c20632..85826c0 100644 --- a/content/about/sponsors/individuals/contents.lr +++ b/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. diff --git a/content/about/sponsors/mdf/contents.lr b/content/about/sponsors/mdf/contents.lr index b661c2f..56f96d3 100644 --- a/content/about/sponsors/mdf/contents.lr +++ b/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). diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index af0619c..34aa8d6 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/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. diff --git a/content/about/sponsors/nsf-georgetown/contents.lr b/content/about/sponsors/nsf-georgetown/contents.lr index 202b6b0..06c299c 100644 --- a/content/about/sponsors/nsf-georgetown/contents.lr +++ b/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. diff --git a/content/about/sponsors/nsf-illinois-chicago/contents.lr b/content/about/sponsors/nsf-illinois-chicago/contents.lr index 2e93dc3..70db26c 100644 --- a/content/about/sponsors/nsf-illinois-chicago/contents.lr +++ b/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 --- diff --git a/content/about/sponsors/nsf-minnesota/contents.lr b/content/about/sponsors/nsf-minnesota/contents.lr index 22b0ca0..24095a6 100644 --- a/content/about/sponsors/nsf-minnesota/contents.lr +++ b/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. diff --git a/content/about/sponsors/nsf-princeton/contents.lr b/content/about/sponsors/nsf-princeton/contents.lr index 7dda390..42380d9 100644 --- a/content/about/sponsors/nsf-princeton/contents.lr +++ b/content/about/sponsors/nsf-princeton/contents.lr @@ -1,6 +1,6 @@ _model: sponsor --- -active: True +active: False --- time: 2012 - 2018 --- diff --git a/content/about/sponsors/nsf-rice/contents.lr b/content/about/sponsors/nsf-rice/contents.lr index 56c5474..1b9c30d 100644 --- a/content/about/sponsors/nsf-rice/contents.lr +++ b/content/about/sponsors/nsf-rice/contents.lr @@ -1,6 +1,6 @@ _model: sponsor --- -active: True +active: False --- time: 2006 - 2007 --- diff --git a/content/about/sponsors/nsf-rochester/contents.lr b/content/about/sponsors/nsf-rochester/contents.lr index 703d11d..0cdbc03 100644 --- a/content/about/sponsors/nsf-rochester/contents.lr +++ b/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. diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index 2583fa1..04c2513 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/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. diff --git a/content/about/sponsors/rose/contents.lr b/content/about/sponsors/rose/contents.lr index 49a48a8..12b280b 100644 --- a/content/about/sponsors/rose/contents.lr +++ b/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. diff --git a/content/about/sponsors/sida/contents.lr b/content/about/sponsors/sida/contents.lr index b8b9d5a..6812bae 100644 --- a/content/about/sponsors/sida/contents.lr +++ b/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. diff --git a/models/sponsor.ini b/models/sponsor.ini index 2ec323c..e1ec7e5 100644 --- a/models/sponsor.ini +++ b/models/sponsor.ini @@ -28,3 +28,7 @@ type = string [fields.time] label = Time type = string + +[fields.key] +label = Key +type = string diff --git a/models/sponsors.ini b/models/sponsors.ini index 292cbea..a262880 100644 --- a/models/sponsors.ini +++ b/models/sponsors.ini @@ -25,4 +25,4 @@ type = string [children] model = sponsor -order_by = name +order_by = key diff --git a/templates/history.html b/templates/history.html index f1dcafe..b90386d 100644 --- a/templates/history.html +++ b/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 }} diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html index a408126..d49f33c 100644 --- a/templates/macros/sponsors.html +++ b/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> diff --git a/templates/sponsors.html b/templates/sponsors.html index 228a582..bcc0974 100644 --- a/templates/sponsors.html +++ b/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>

1 0

[tpo/master] sponsor update
by hiro＠torproject.org 01 Feb '19

01 Feb '19

commit 7a4ddb3abe7aeb98f09351372b93b6223d986601 Author: Antonela <hola(a)antonela.me> Date: Fri Feb 1 13:12:11 2019 +0100 sponsor update --- assets/static/images/sponsors/darpa.png | Bin 127422 -> 147898 bytes assets/static/images/sponsors/nsf-georgetown.png | Bin 0 -> 89533 bytes assets/static/images/sponsors/nsf-minnesota.png | Bin 0 -> 83004 bytes assets/static/images/sponsors/nsf-rit.png | Bin 0 -> 76449 bytes content/about/sponsors/DARPA-penn/contents.lr | 6 ++++-- .../about/sponsors/USSD-DHRL-harvard/contents.lr | 6 ++++-- content/about/sponsors/USSD-DHRL/contents.lr | 6 ++++-- content/about/sponsors/contents.lr | 2 +- content/about/sponsors/cymru/contents.lr | 4 +++- content/about/sponsors/fastly/contents.lr | 5 ++++- content/about/sponsors/handshake/contents.lr | 6 ++++-- content/about/sponsors/imls-ny/contents.lr | 6 ++++-- content/about/sponsors/individuals/contents.lr | 5 +++-- content/about/sponsors/mdf/contents.lr | 4 +++- content/about/sponsors/mozilla/contents.lr | 7 ++++--- content/about/sponsors/nsf-georgetown/contents.lr | 8 +++++--- .../sponsors/nsf-illinois-chicago/contents.lr | 4 ++-- content/about/sponsors/nsf-minnesota/contents.lr | 6 ++++-- content/about/sponsors/nsf-princeton/contents.lr | 2 +- content/about/sponsors/nsf-rice/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 8 +++++--- content/about/sponsors/otf/contents.lr | 7 ++++--- content/about/sponsors/rose/contents.lr | 6 ++++-- content/about/sponsors/sida/contents.lr | 7 ++++--- models/sponsor.ini | 4 ++++ models/sponsors.ini | 2 +- templates/history.html | 2 +- templates/macros/sponsors.html | 4 ++-- templates/sponsors.html | 14 ++++++++++---- 29 files changed, 86 insertions(+), 47 deletions(-) diff --git a/assets/static/images/sponsors/darpa.png b/assets/static/images/sponsors/darpa.png index 8a6e79c..8d4bb81 100644 Binary files a/assets/static/images/sponsors/darpa.png and b/assets/static/images/sponsors/darpa.png differ diff --git a/assets/static/images/sponsors/nsf-georgetown.png b/assets/static/images/sponsors/nsf-georgetown.png new file mode 100644 index 0000000..290c58e Binary files /dev/null and b/assets/static/images/sponsors/nsf-georgetown.png differ diff --git a/assets/static/images/sponsors/nsf-minnesota.png b/assets/static/images/sponsors/nsf-minnesota.png new file mode 100644 index 0000000..b3979f3 Binary files /dev/null and b/assets/static/images/sponsors/nsf-minnesota.png differ diff --git a/assets/static/images/sponsors/nsf-rit.png b/assets/static/images/sponsors/nsf-rit.png new file mode 100644 index 0000000..566bc9f Binary files /dev/null and b/assets/static/images/sponsors/nsf-rit.png differ diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index a54e527..4eb1e31 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/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. diff --git a/content/about/sponsors/USSD-DHRL-harvard/contents.lr b/content/about/sponsors/USSD-DHRL-harvard/contents.lr index 4d43285..efde019 100644 --- a/content/about/sponsors/USSD-DHRL-harvard/contents.lr +++ b/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. diff --git a/content/about/sponsors/USSD-DHRL/contents.lr b/content/about/sponsors/USSD-DHRL/contents.lr index 0d19722..75b30fa 100644 --- a/content/about/sponsors/USSD-DHRL/contents.lr +++ b/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. diff --git a/content/about/sponsors/contents.lr b/content/about/sponsors/contents.lr index 2d54703..9434ab9 100644 --- a/content/about/sponsors/contents.lr +++ b/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. diff --git a/content/about/sponsors/cymru/contents.lr b/content/about/sponsors/cymru/contents.lr index 3a4d4d5..8cf5c69 100644 --- a/content/about/sponsors/cymru/contents.lr +++ b/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. diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index bbd1e20..1338382 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/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. diff --git a/content/about/sponsors/handshake/contents.lr b/content/about/sponsors/handshake/contents.lr index b39a8b8..97537b9 100644 --- a/content/about/sponsors/handshake/contents.lr +++ b/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. diff --git a/content/about/sponsors/imls-ny/contents.lr b/content/about/sponsors/imls-ny/contents.lr index 1243e54..f4d7db7 100644 --- a/content/about/sponsors/imls-ny/contents.lr +++ b/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. diff --git a/content/about/sponsors/individuals/contents.lr b/content/about/sponsors/individuals/contents.lr index 1c20632..85826c0 100644 --- a/content/about/sponsors/individuals/contents.lr +++ b/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. diff --git a/content/about/sponsors/mdf/contents.lr b/content/about/sponsors/mdf/contents.lr index b661c2f..56f96d3 100644 --- a/content/about/sponsors/mdf/contents.lr +++ b/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). diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index af0619c..34aa8d6 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/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. diff --git a/content/about/sponsors/nsf-georgetown/contents.lr b/content/about/sponsors/nsf-georgetown/contents.lr index 202b6b0..06c299c 100644 --- a/content/about/sponsors/nsf-georgetown/contents.lr +++ b/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. diff --git a/content/about/sponsors/nsf-illinois-chicago/contents.lr b/content/about/sponsors/nsf-illinois-chicago/contents.lr index 2e93dc3..70db26c 100644 --- a/content/about/sponsors/nsf-illinois-chicago/contents.lr +++ b/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 --- diff --git a/content/about/sponsors/nsf-minnesota/contents.lr b/content/about/sponsors/nsf-minnesota/contents.lr index 22b0ca0..24095a6 100644 --- a/content/about/sponsors/nsf-minnesota/contents.lr +++ b/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. diff --git a/content/about/sponsors/nsf-princeton/contents.lr b/content/about/sponsors/nsf-princeton/contents.lr index 7dda390..42380d9 100644 --- a/content/about/sponsors/nsf-princeton/contents.lr +++ b/content/about/sponsors/nsf-princeton/contents.lr @@ -1,6 +1,6 @@ _model: sponsor --- -active: True +active: False --- time: 2012 - 2018 --- diff --git a/content/about/sponsors/nsf-rice/contents.lr b/content/about/sponsors/nsf-rice/contents.lr index 56c5474..1b9c30d 100644 --- a/content/about/sponsors/nsf-rice/contents.lr +++ b/content/about/sponsors/nsf-rice/contents.lr @@ -1,6 +1,6 @@ _model: sponsor --- -active: True +active: False --- time: 2006 - 2007 --- diff --git a/content/about/sponsors/nsf-rochester/contents.lr b/content/about/sponsors/nsf-rochester/contents.lr index 703d11d..0cdbc03 100644 --- a/content/about/sponsors/nsf-rochester/contents.lr +++ b/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. diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index 2583fa1..04c2513 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/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. diff --git a/content/about/sponsors/rose/contents.lr b/content/about/sponsors/rose/contents.lr index 49a48a8..12b280b 100644 --- a/content/about/sponsors/rose/contents.lr +++ b/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. diff --git a/content/about/sponsors/sida/contents.lr b/content/about/sponsors/sida/contents.lr index b8b9d5a..6812bae 100644 --- a/content/about/sponsors/sida/contents.lr +++ b/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. diff --git a/models/sponsor.ini b/models/sponsor.ini index 2ec323c..e1ec7e5 100644 --- a/models/sponsor.ini +++ b/models/sponsor.ini @@ -28,3 +28,7 @@ type = string [fields.time] label = Time type = string + +[fields.key] +label = Key +type = string diff --git a/models/sponsors.ini b/models/sponsors.ini index 292cbea..a262880 100644 --- a/models/sponsors.ini +++ b/models/sponsors.ini @@ -25,4 +25,4 @@ type = string [children] model = sponsor -order_by = name +order_by = key diff --git a/templates/history.html b/templates/history.html index f1dcafe..b90386d 100644 --- a/templates/history.html +++ b/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 }} diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html index a408126..d49f33c 100644 --- a/templates/macros/sponsors.html +++ b/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> diff --git a/templates/sponsors.html b/templates/sponsors.html index 228a582..bcc0974 100644 --- a/templates/sponsors.html +++ b/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>

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 01 Feb '19

01 Feb '19

commit 020845581e5e1fb9b38ab3274864ea44e21e5840 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 1 13:49:07 2019 +0000 Update translations for torbutton-browseronboardingproperties --- fi/browserOnboarding.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/browserOnboarding.properties b/fi/browserOnboarding.properties index 1c20ccbba..2ce4d4b89 100644 --- a/fi/browserOnboarding.properties +++ b/fi/browserOnboarding.properties @@ -8,7 +8,7 @@ onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=Yksityisyys -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. +onboarding.tour-tor-privacy.title=Kukista kyttääjät ja nuuskijat. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Siirry Tor-verkkoon

1 0

[translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd
by translation＠torproject.org 01 Feb '19

01 Feb '19

commit 4c575feaa188ec3c4cca84452e0b1fc77ac4f230 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 1 13:47:16 2019 +0000 Update translations for tba-torbrowserstringsdtd --- fi/android_strings.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fi/android_strings.dtd b/fi/android_strings.dtd index 2b4ed5240..850117665 100644 --- a/fi/android_strings.dtd +++ b/fi/android_strings.dtd @@ -1,14 +1,14 @@  <!ENTITY firstrun_welcome_tab_title "Tervetuloa"> <!ENTITY firstrun_welcome_title "Valmista tuli."> -<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> +<!ENTITY firstrun_welcome_message "Tor-selain tarjoaa korkeimman standardin yksityisessä ja turvallisessa internetselauksessa. Olet nyt suojattu seurantaa, valvontaa ja sensuuria vastaan. Tässä nopea katsaus miten selain toimii."> <!ENTITY firstrun_welcome_next "Aloita nyt"> <!ENTITY firstrun_privacy_tab_title "Yksityisyys"> -<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> +<!ENTITY firstrun_privacy_title "Kukista kyttääjät ja nuuskijat."> <!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> -<!ENTITY firstrun_privacy_next "Go to Tor Network"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> -<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> +<!ENTITY firstrun_privacy_next "Siirry Tor-verkkoon"> +<!ENTITY firstrun_tornetwork_tab_title "Tor-verkko"> +<!ENTITY firstrun_tornetwork_title "Selaa hajautetussa verkossa."> <!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> <!ENTITY firstrun_tornetwork_next "Seuraava"> <!ENTITY firstrun_secsettings_tab_title "Turvallisuus"> @@ -16,10 +16,10 @@ <!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> <!ENTITY firstrun_secsettings_next "Seuraava"> <!ENTITY firstrun_tips_tab_title "Vihjeet"> -<!ENTITY firstrun_tips_title "Experience Tips."> +<!ENTITY firstrun_tips_title "Käyttövinkkejä."> <!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> <!ENTITY firstrun_tips_next "Seuraava"> -<!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion Services."> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> -<!ENTITY firstrun_onionservices_next "Go to explore"> +<!ENTITY firstrun_onionservices_tab_title "Sipulit"> +<!ENTITY firstrun_onionservices_title "Sipulipalvelut."> +<!ENTITY firstrun_onionservices_message "Sipulipalvelut ovat verkkosivuja joilla on .onion -pääte. Nämä palvelut tarjoavat lisäsuojausta julkaisijoille ja kävijöille, sekä sisältävät suojakeinoja sensuuria vastaan. Sipulipalvelut mahdollistavat kenen tahansa tarjota sisältöä ja palveluita anonyymisti."> +<!ENTITY firstrun_onionservices_next "Aloita tutkiminen">

1 0

[translation/torbutton-browseronboardingproperties] Update translations for torbutton-browseronboardingproperties
by translation＠torproject.org 01 Feb '19

01 Feb '19

commit 197851d3f219e17c48fe7c8903d611febeca70da Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 1 13:19:23 2019 +0000 Update translations for torbutton-browseronboardingproperties --- fi/browserOnboarding.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fi/browserOnboarding.properties b/fi/browserOnboarding.properties index 95770a602..1c20ccbba 100644 --- a/fi/browserOnboarding.properties +++ b/fi/browserOnboarding.properties @@ -10,10 +10,10 @@ onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=Yksityisyys onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.button=Siirry Tor-verkkoon -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. +onboarding.tour-tor-network=Tor-verkko +onboarding.tour-tor-network.title=Selaa hajautetussa verkossa. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -23,7 +23,7 @@ onboarding.tour-tor-circuit-display.description=For each domain you visit, your onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=Turvallisuus -onboarding.tour-tor-security.title=Choose your experience. +onboarding.tour-tor-security.title=Valitse kokemus jonka haluat. onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings

1 0