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

[tpo/staging] better forward and position
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 16ccf0bab48d97aa06d51a4542002abc1d2843c8 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 11:17:21 2019 +0100 better forward and position --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 1254c39..4170d6e 100644 --- a/.htaccess +++ b/.htaccess @@ -34,6 +34,7 @@ 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/RecommendedTBBVersions ttps://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions [R=302,L] +RewriteRule ^projects/torbrowser.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] @@ -71,7 +72,6 @@ RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=301,L] # Download websites -RewriteRule ^torbrowser.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^download/download/$ /download [R=301,L] RewriteRule ^download/download.html(.*) /download [R=301,L] RewriteRule ^download.html(.*) /download [R=301,L]

1 0

[tpo/staging] Add pronoun.is link to people page
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 9b537d4029ccb9097d7b27c88549f7abf064377e Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 12:32:45 2019 +0100 Add pronoun.is link to people page --- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/alsmith/contents.lr | 2 +- content/about/people/antonela/contents.lr | 2 +- content/about/people/atagar/contents.lr | 2 +- content/about/people/bdavila/contents.lr | 2 +- content/about/people/boklm/contents.lr | 2 +- content/about/people/catalyst/contents.lr | 2 +- content/about/people/cindy-core/contents.lr | 2 +- content/about/people/emmapeel/contents.lr | 2 +- content/about/people/ewyatt/contents.lr | 2 +- content/about/people/flexlibris/contents.lr | 2 +- content/about/people/gaba/contents.lr | 2 +- content/about/people/iangoldberg/contents.lr | 2 +- content/about/people/intrigeri/contents.lr | 2 +- content/about/people/irl/contents.lr | 2 +- content/about/people/karsten/contents.lr | 2 +- content/about/people/kat/contents.lr | 2 +- content/about/people/kushal/contents.lr | 2 +- content/about/people/ln5/contents.lr | 2 +- content/about/people/mcs/contents.lr | 2 +- content/about/people/nickm/contents.lr | 2 +- content/about/people/pili/contents.lr | 2 +- content/about/people/pospeselr/contents.lr | 2 +- content/about/people/sajolida/contents.lr | 2 +- content/about/people/sisbell/contents.lr | 2 +- content/about/people/sjmurdoch/contents.lr | 2 +- content/about/people/ssteele-core/contents.lr | 2 +- content/about/people/sstevenson/contents.lr | 2 +- content/about/people/stephw/contents.lr | 2 +- content/about/people/teor/contents.lr | 2 +- content/about/people/tjr/contents.lr | 2 +- content/about/people/wayward/contents.lr | 2 +- content/about/people/wseltzer/contents.lr | 2 +- templates/macros/people.html | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/content/about/people/agrabeli/contents.lr b/content/about/people/agrabeli/contents.lr index 57e7e75..7de910d 100644 --- a/content/about/people/agrabeli/contents.lr +++ b/content/about/people/agrabeli/contents.lr @@ -8,7 +8,7 @@ name: Maria Xynou --- nickname: agrabeli --- -pronoun: she +pronoun: https://pronoun.is/she --- twitter_handle: agrabeli_ --- diff --git a/content/about/people/ahf/contents.lr b/content/about/people/ahf/contents.lr index d49d8ac..57d27fe 100644 --- a/content/about/people/ahf/contents.lr +++ b/content/about/people/ahf/contents.lr @@ -8,7 +8,7 @@ name: Alexander Færøy --- twitter_handle: ahfaeroey --- -pronoun: he +pronoun: https://pronoun.is/he --- nickname: ahf --- diff --git a/content/about/people/alsmith/contents.lr b/content/about/people/alsmith/contents.lr index 50624b6..1a2ca7c 100644 --- a/content/about/people/alsmith/contents.lr +++ b/content/about/people/alsmith/contents.lr @@ -12,7 +12,7 @@ gpg: /static/keys/alsmith.txt --- image: /static/images/people/alsmith.png --- -pronoun: they +pronoun: https://pronoun.is/they --- description: diff --git a/content/about/people/antonela/contents.lr b/content/about/people/antonela/contents.lr index 22b058c..396a80f 100644 --- a/content/about/people/antonela/contents.lr +++ b/content/about/people/antonela/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Antonela Debiasi --- -pronoun: she +pronoun: https://pronoun.is/she --- nickname: antonela --- diff --git a/content/about/people/atagar/contents.lr b/content/about/people/atagar/contents.lr index e416c59..563c88a 100644 --- a/content/about/people/atagar/contents.lr +++ b/content/about/people/atagar/contents.lr @@ -8,7 +8,7 @@ name: Damian Johnson --- nickname: atagar --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD9… --- diff --git a/content/about/people/bdavila/contents.lr b/content/about/people/bdavila/contents.lr index c41d0f6..1163268 100644 --- a/content/about/people/bdavila/contents.lr +++ b/content/about/people/bdavila/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Bekeela Davila --- -pronoun: she +pronoun: https://pronoun.is/she --- nickname: bdavila --- diff --git a/content/about/people/boklm/contents.lr b/content/about/people/boklm/contents.lr index df01f83..cc2902d 100644 --- a/content/about/people/boklm/contents.lr +++ b/content/about/people/boklm/contents.lr @@ -8,7 +8,7 @@ name: Nicolas Vigier --- nickname: boklm --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://www.torproject.org/images/pgp-key.png --- diff --git a/content/about/people/catalyst/contents.lr b/content/about/people/catalyst/contents.lr index f91d088..85695d4 100644 --- a/content/about/people/catalyst/contents.lr +++ b/content/about/people/catalyst/contents.lr @@ -10,7 +10,7 @@ nickname: catalyst --- twitter_handle: argonblue --- -pronoun: they +pronoun: https://pronoun.is/they --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606… --- diff --git a/content/about/people/cindy-core/contents.lr b/content/about/people/cindy-core/contents.lr index 4398526..898886e 100644 --- a/content/about/people/cindy-core/contents.lr +++ b/content/about/people/cindy-core/contents.lr @@ -8,7 +8,7 @@ name: Cindy Cohn --- nickname: cindy --- -pronoun: she +pronoun: https://pronoun.is/she --- gpg: https://www.eff.org/files/key_cindy.txt --- diff --git a/content/about/people/emmapeel/contents.lr b/content/about/people/emmapeel/contents.lr index 7e685b8..b5e529c 100644 --- a/content/about/people/emmapeel/contents.lr +++ b/content/about/people/emmapeel/contents.lr @@ -6,7 +6,7 @@ role:core --- name: emmapeel --- -pronoun: she +pronoun: https://pronoun.is/she --- nickname: emmapeel --- diff --git a/content/about/people/ewyatt/contents.lr b/content/about/people/ewyatt/contents.lr index f1bb5e4..1e73c80 100644 --- a/content/about/people/ewyatt/contents.lr +++ b/content/about/people/ewyatt/contents.lr @@ -8,7 +8,7 @@ name: Erin Wyatt --- nickname: ewyatt --- -pronoun: she +pronoun: https://pronoun.is/she --- gpg: /static/keys/ewyatt.txt --- diff --git a/content/about/people/flexlibris/contents.lr b/content/about/people/flexlibris/contents.lr index 6bc58b8..d5948b7 100644 --- a/content/about/people/flexlibris/contents.lr +++ b/content/about/people/flexlibris/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Alison Macrina --- -pronoun: she +pronoun: https://pronoun.is/she --- twitter_handle: flexlibris --- diff --git a/content/about/people/gaba/contents.lr b/content/about/people/gaba/contents.lr index 63cf237..2f994c9 100644 --- a/content/about/people/gaba/contents.lr +++ b/content/about/people/gaba/contents.lr @@ -8,7 +8,7 @@ name: Gaba --- nickname: gaba --- -pronoun: she +pronoun: https://pronoun.is/she --- gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0x180DB06C59CABD19 --- diff --git a/content/about/people/iangoldberg/contents.lr b/content/about/people/iangoldberg/contents.lr index dab35ea..d84812e 100644 --- a/content/about/people/iangoldberg/contents.lr +++ b/content/about/people/iangoldberg/contents.lr @@ -8,7 +8,7 @@ name: Ian Goldberg --- nickname: iang --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: /static/keys/ian.txt --- diff --git a/content/about/people/intrigeri/contents.lr b/content/about/people/intrigeri/contents.lr index 1df6faa..7199bde 100644 --- a/content/about/people/intrigeri/contents.lr +++ b/content/about/people/intrigeri/contents.lr @@ -8,7 +8,7 @@ name: intrigeri --- nickname: intrigeri --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://gaffer.ptitcanardnoir.org/intrigeri/contact/ --- diff --git a/content/about/people/irl/contents.lr b/content/about/people/irl/contents.lr index 7a750ff..7b4a908 100644 --- a/content/about/people/irl/contents.lr +++ b/content/about/people/irl/contents.lr @@ -10,7 +10,7 @@ nickname: irl --- twitter_handle: iainlearmonth --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=A8F7BA5041E133339CBA1696… --- diff --git a/content/about/people/karsten/contents.lr b/content/about/people/karsten/contents.lr index b08ef92..37306f5 100644 --- a/content/about/people/karsten/contents.lr +++ b/content/about/people/karsten/contents.lr @@ -8,7 +8,7 @@ name: Karsten Loesing --- nickname: karsten --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=0CC8157C2578EEE92B0745D6… --- diff --git a/content/about/people/kat/contents.lr b/content/about/people/kat/contents.lr index e3eee28..8fc4daa 100644 --- a/content/about/people/kat/contents.lr +++ b/content/about/people/kat/contents.lr @@ -8,7 +8,7 @@ name: Kat --- nickname: kat5 --- -pronoun: she +pronoun: https://pronoun.is/she --- gpg: /static/keys/kat.txt --- diff --git a/content/about/people/kushal/contents.lr b/content/about/people/kushal/contents.lr index 16b53e9..fa408e3 100644 --- a/content/about/people/kushal/contents.lr +++ b/content/about/people/kushal/contents.lr @@ -8,7 +8,7 @@ name: Kushal Das --- nickname: kushal --- -pronoun: he +pronoun: https://pronoun.is/he --- twitter_handle: kushaldas --- diff --git a/content/about/people/ln5/contents.lr b/content/about/people/ln5/contents.lr index 380bf7c..406192d 100644 --- a/content/about/people/ln5/contents.lr +++ b/content/about/people/ln5/contents.lr @@ -8,7 +8,7 @@ name: Linus Nordberg --- nickname: ln5 --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA2… --- diff --git a/content/about/people/mcs/contents.lr b/content/about/people/mcs/contents.lr index cf3f92c..1a67017 100644 --- a/content/about/people/mcs/contents.lr +++ b/content/about/people/mcs/contents.lr @@ -8,7 +8,7 @@ name: Marc Smith --- nickname: mcs --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=2602B0DD0EB238CCE037196A… --- diff --git a/content/about/people/nickm/contents.lr b/content/about/people/nickm/contents.lr index a8f3955..4c2cf6d 100644 --- a/content/about/people/nickm/contents.lr +++ b/content/about/people/nickm/contents.lr @@ -6,7 +6,7 @@ role:core --- name: Nick Mathewson --- -pronoun: he +pronoun: https://pronoun.is/he --- nickname: nickm --- diff --git a/content/about/people/pili/contents.lr b/content/about/people/pili/contents.lr index 9916b41..a692f38 100644 --- a/content/about/people/pili/contents.lr +++ b/content/about/people/pili/contents.lr @@ -10,7 +10,7 @@ nickname: pili --- twitter_handle: mpguerra --- -pronoun: she +pronoun: https://pronoun.is/she --- gpg: https://pgp.mit.edu/pks/lookup?op=vindex&search=0xC6CB772EF0969C45 --- diff --git a/content/about/people/pospeselr/contents.lr b/content/about/people/pospeselr/contents.lr index f3885a5..6cbb971 100644 --- a/content/about/people/pospeselr/contents.lr +++ b/content/about/people/pospeselr/contents.lr @@ -8,7 +8,7 @@ name: Richard Pospesel --- nickname: pospeselr --- -pronoun: they/them +pronoun: https://pronoun.is/they/them --- twitter_handle: pospeselr --- diff --git a/content/about/people/sajolida/contents.lr b/content/about/people/sajolida/contents.lr index cddc3bc..56e6644 100644 --- a/content/about/people/sajolida/contents.lr +++ b/content/about/people/sajolida/contents.lr @@ -8,7 +8,7 @@ name: sajolida --- nickname: sajolida --- -pronoun: he +pronoun: https://pronoun.is/he --- gpg: /static/keys/sajolida.txt --- diff --git a/content/about/people/sisbell/contents.lr b/content/about/people/sisbell/contents.lr index 2f95fd9..1280796 100644 --- a/content/about/people/sisbell/contents.lr +++ b/content/about/people/sisbell/contents.lr @@ -8,7 +8,7 @@ name: Shane Isbell --- nickname: sisbell --- -pronoun: he +pronoun: https://pronoun.is/he --- twitter_handle: sisbell --- diff --git a/content/about/people/sjmurdoch/contents.lr b/content/about/people/sjmurdoch/contents.lr index 19da14a..a3d3f0b 100644 --- a/content/about/people/sjmurdoch/contents.lr +++ b/content/about/people/sjmurdoch/contents.lr @@ -8,7 +8,7 @@ name: Steven Murdoch --- nickname: sjmurdoch --- -pronoun: he +pronoun: https://pronoun.is/he --- twitter_handle: sjmurdoch --- diff --git a/content/about/people/ssteele-core/contents.lr b/content/about/people/ssteele-core/contents.lr index 09af9d2..7a25552 100644 --- a/content/about/people/ssteele-core/contents.lr +++ b/content/about/people/ssteele-core/contents.lr @@ -8,7 +8,7 @@ name: Shari Steele --- nickname: ssteele --- -pronoun: she +pronoun: https://pronoun.is/she --- twitter_handle: ssteele1234 --- diff --git a/content/about/people/sstevenson/contents.lr b/content/about/people/sstevenson/contents.lr index 3269de4..978a0f8 100644 --- a/content/about/people/sstevenson/contents.lr +++ b/content/about/people/sstevenson/contents.lr @@ -8,7 +8,7 @@ name: Sarah Stevenson --- nickname: sstevenson --- -pronoun: she +pronoun: https://pronoun.is/she --- image: /static/images/people/sstevenson.png --- diff --git a/content/about/people/stephw/contents.lr b/content/about/people/stephw/contents.lr index cae06da..c907734 100644 --- a/content/about/people/stephw/contents.lr +++ b/content/about/people/stephw/contents.lr @@ -8,7 +8,7 @@ name: Stephanie Whited --- nickname: stephw --- -pronoun: she +pronoun: https://pronoun.is/she --- twitter_handle: walnutwordsalad --- diff --git a/content/about/people/teor/contents.lr b/content/about/people/teor/contents.lr index 1d703e2..06b2f9b 100644 --- a/content/about/people/teor/contents.lr +++ b/content/about/people/teor/contents.lr @@ -8,7 +8,7 @@ name: teor --- nickname: teor --- -pronoun: they +pronoun: https://pronoun.is/they --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43… --- diff --git a/content/about/people/tjr/contents.lr b/content/about/people/tjr/contents.lr index 3fa1649..fb099d7 100644 --- a/content/about/people/tjr/contents.lr +++ b/content/about/people/tjr/contents.lr @@ -8,7 +8,7 @@ name: Tom Ritter --- nickname: tjr --- -pronoun: he +pronoun: https://pronoun.is/he --- twitter_handle: tomrittervg --- diff --git a/content/about/people/wayward/contents.lr b/content/about/people/wayward/contents.lr index 5b8422c..f62e3df 100644 --- a/content/about/people/wayward/contents.lr +++ b/content/about/people/wayward/contents.lr @@ -8,7 +8,7 @@ name: Maggie Haughey --- nickname: wayward --- -pronoun: she +pronoun: https://pronoun.is/she --- twitter_handle: meochaidha --- diff --git a/content/about/people/wseltzer/contents.lr b/content/about/people/wseltzer/contents.lr index 2922a6f..85e6086 100644 --- a/content/about/people/wseltzer/contents.lr +++ b/content/about/people/wseltzer/contents.lr @@ -8,7 +8,7 @@ name: Wendy Seltzer --- nickname: wseltzer --- -pronoun: she +pronoun: https://pronoun.is/she --- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=4263006A4506740FAD871430… --- diff --git a/templates/macros/people.html b/templates/macros/people.html index 18e3285..5b89502 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -38,7 +38,7 @@ <div class="card-body"> <h5 class="card-title human-name">{{ item.name }}</h5> {% if item.pronoun %} - <h6 class="nick text-primary m-0">PRO:{{ item.pronoun }}</h6> + <h6 class="nick text-primary m-0"><a href="{{ item.pronoun }}">{{ item.pronoun }}</a></h6> {% endif %} {% if item.nickname %} <label class="nick text-primary">IRC:{{ item.nickname }}</label>

1 0

[tpo/staging] Add cohosh to people page
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit f4f9f5c5ba41a78a889cb6f35992534a1c08086e Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 12:17:38 2019 +0100 Add cohosh to people page --- content/about/people/cohosh/contents.lr | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/content/about/people/cohosh/contents.lr b/content/about/people/cohosh/contents.lr new file mode 100644 index 0000000..697852d --- /dev/null +++ b/content/about/people/cohosh/contents.lr @@ -0,0 +1,15 @@ +_model: person +--- +_hidden: yes +--- +role: core +--- +name: Cecylia +--- +nickname: cohosh +--- +gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=5A618CE840883942BAF1334F… +--- +description: + +Developer on the anti-censorship team. Works on pluggable transport development and integration, and BridgeDB.

1 0

[tpo/staging] fix peoples page redirect
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 2f950fff4beeb06e3a8679f9bdc980756be61f9a Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 11:51:17 2019 +0100 fix peoples page redirect --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index d37c999..556b66e 100644 --- a/.htaccess +++ b/.htaccess @@ -1,7 +1,7 @@ RewriteEngine On # about -RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] +RewriteRule ^about/corepeople.html.en$ /about/people/ [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] # moved to /docs/

1 0

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

06 Apr '19

commit f11913ba7fafaa6aaf8273cc72f7fa1c9da1b5ac Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Mar 28 15:02:03 2019 +0000 Update home.html Adds Tor Browser instead of just "tor", because fingerprinting is a Tor Browser feature. --- templates/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/home.html b/templates/home.html index befd710..1f50e26 100644 --- a/templates/home.html +++ b/templates/home.html @@ -43,7 +43,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">{{ _("RESIST FINGERPRINTING") }}</h4> - <p class="card-text">{{ _("Tor aims to make all users look the same making it difficult for you to be fingerprinted based on your browser and device information.") }}</p> + <p class="card-text">{{ _("Tor Browser aims to make all users look the same making it difficult for you to be fingerprinted based on your browser and device information.") }}</p> </div> </div> </div>

1 0

[tpo/staging] better like this, nothing is forever. thanks weasel
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 797a091f028528f509a57617b4b9c0b0f6255c39 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 11:20:00 2019 +0100 better like this, nothing is forever. thanks weasel --- .htaccess | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.htaccess b/.htaccess index 4170d6e..d37c999 100644 --- a/.htaccess +++ b/.htaccess @@ -20,16 +20,16 @@ RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L] # Tor Browser -RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] +RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=302,L] RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] RewriteRule ^torbrowser$ https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] # tordnsel -RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L] +RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=302,L] # Overview -RewriteRule ^overview(.*) /about/history$1 [R=301,L] +RewriteRule ^overview(.*) /about/history$1 [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] @@ -45,7 +45,7 @@ RewriteRule ^projects/obfsproxy-instructions(.*) https://2019.www.torproject.org RewriteRule ^projects/obfsproxy(.*) https://2019.www.torproject.org/docs/pluggable-transports [R=302,L] #Relays -RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=301,L] +RewriteRule ^relay-guide(.*) https://trac.torproject.org/projects/tor/wiki/TorRelayGuide [R=302,L] # GetInvolved RewriteRule ^getinvolved/$ https://2019.www.torproject.org/getinvolved/volunteer [R=302,L] @@ -54,32 +54,32 @@ RewriteRule ^getinvolved(.*) https://2019.www.torproject.org/getinvolved$1 [R=30 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] -RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L] -RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] +RewriteRule ^research(.*) https://research.torproject.org/ [R=302,L] +RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=302,L] # Support -RewriteRule ^support(.*) https://support.torproject.org [R=301,L] +RewriteRule ^support(.*) https://support.torproject.org [R=302,L] # Newsletter -RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] +RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L] # Press RewriteRule ^press/press(.*) /press [R=302,L] # other (feel free to categorize) -RewriteRule ^people(.*) /about/people$1 [R=301,L] +RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] -RewriteRule ^about/contact(.*) /contact$1 [R=301,L] +RewriteRule ^about/contact(.*) /contact$1 [R=302,L] # Download websites -RewriteRule ^download/download/$ /download [R=301,L] -RewriteRule ^download/download.html(.*) /download [R=301,L] -RewriteRule ^download.html(.*) /download [R=301,L] -RewriteRule ^download/easy-download(.*) /download [R=301,L] +RewriteRule ^download/download/$ /download [R=302,L] +RewriteRule ^download/download.html(.*) /download [R=302,L] +RewriteRule ^download.html(.*) /download [R=302,L] +RewriteRule ^download/easy-download(.*) /download [R=302,L] RewriteRule ^download/download-easy(.*) /download [R=302,L] # Relays -RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] +RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=302,L] # Index Pages RewriteRule ^about/overview(.*) /about/history$1 [R=302,L]

1 0

[tpo/staging] fix catched expression
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 665c104ef66a50f9de256d48ec793d75793fd4a6 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 16:42:01 2019 +0100 fix catched expression --- .htaccess | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 9496428..b186061 100644 --- a/.htaccess +++ b/.htaccess @@ -33,10 +33,9 @@ RewriteRule ^overview(.*) /about/history$1 [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] -RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$ [R=302,L] -RewriteRule ^projects/torbrowser.html.en#downloads-alpha$ /download/alpha [R=302,L] +RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$1 [R=302,L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] -RewriteRule ^projects/(.*) https://2019.www.torproject.org/projects/projects$ [R=302,L] +RewriteRule ^projects/(.*) https://2019.www.torproject.org/projects/projects$1 [R=302,L] #Pluggable Transports RewriteRule ^PT/?$ https://2019.www.torproject.org/docs/pluggable-transports [R=302,L]

1 0

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

06 Apr '19

commit bc37b7445ef057cc1f23646052353f3f38160f8a Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 12:11:58 2019 +0100 Update .htaccess --- .htaccess | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.htaccess b/.htaccess index 556b66e..9496428 100644 --- a/.htaccess +++ b/.htaccess @@ -20,7 +20,7 @@ RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R=302,L] # Tor Browser -RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=302,L] +RewriteRule ^torbrowser/dist/(.*) https://2019.www.torproject.org//dist/torbrowser/$1 [R=302,L] RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] RewriteRule ^torbrowser$ https://2019.www.torproject.org/projects/torbrowser.html.en [R=302,L] @@ -33,10 +33,10 @@ RewriteRule ^overview(.*) /about/history$1 [R=302,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] -RewriteRule ^projects/torbrowser/RecommendedTBBVersions ttps://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions [R=302,L] +RewriteRule ^projects/torbrowser/RecommendedTBBVersions(.*) https://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions$ [R=302,L] RewriteRule ^projects/torbrowser.html.en#downloads-alpha$ /download/alpha [R=302,L] RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] -RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] +RewriteRule ^projects/(.*) https://2019.www.torproject.org/projects/projects$ [R=302,L] #Pluggable Transports RewriteRule ^PT/?$ https://2019.www.torproject.org/docs/pluggable-transports [R=302,L]

1 0

[tpo/staging] Add pronoun for cohosh
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 42751aa5f604e71dc5b4febd68cbcc6628cbc397 Author: hiro <hiro(a)torproject.org> Date: Thu Mar 28 15:48:15 2019 +0100 Add pronoun for cohosh --- content/about/people/cohosh/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/people/cohosh/contents.lr b/content/about/people/cohosh/contents.lr index 697852d..0c4f22b 100644 --- a/content/about/people/cohosh/contents.lr +++ b/content/about/people/cohosh/contents.lr @@ -8,6 +8,8 @@ name: Cecylia --- nickname: cohosh --- +pronoun: https://pronoun.is/she +--- gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=5A618CE840883942BAF1334F… --- description:

1 0

[tpo/staging] more forwards from arma watching 404 logs
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 5dc9e0022d62866cdf42d6fd7e37c1cb72994f13 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 28 18:12:41 2019 +0100 more forwards from arma watching 404 logs --- .htaccess | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index df6ae3e..43883f9 100644 --- a/.htaccess +++ b/.htaccess @@ -6,7 +6,7 @@ RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] RewriteRule ^about(.*).html.en$ /about$1 [R=302,L] # moved to /docs/ -RewriteRule ^docs/(.*).html.en https://2019.www.torproject.org/docs/$1.html.en [R=302,L] +RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] # Torbutton RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L] @@ -62,9 +62,11 @@ RewriteRule ^press/press(.*) /press [R=302,L] RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] RewriteRule ^about/contact(.*) /contact$1 [R=302,L] +RewriteRule ^contact.html$ /contact/ [R=302,L] # Download websites RewriteRule ^download/download/$ /download [R=302,L] +RewriteRule ^download/download$ /download [R=302,L] RewriteRule ^download/download.html(.*) /download [R=302,L] RewriteRule ^download.html(.*) /download [R=302,L] RewriteRule ^download/easy-download(.*) /download [R=302,L]

1 0