commit f94392348537e0133ab739ab0a4b0991fc3b5347 Author: emma peel emma.peel@riseup.net Date: Thu Oct 28 10:17:54 2021 +0200

content and lego updates --- content/about/people/dgoulet/contents.lr | 2 +- content/about/people/egypcio/contents.lr | 2 ++ content/about/people/eta/contents.lr | 22 ++++++++++++++++++++++ content/about/people/jvoisin/contents.lr | 21 +++++++++++++++++++++ lego | 2 +- templates/press.html | 2 +- 6 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/content/about/people/dgoulet/contents.lr b/content/about/people/dgoulet/contents.lr index 80ecc2e8..6d582346 100644 --- a/content/about/people/dgoulet/contents.lr +++ b/content/about/people/dgoulet/contents.lr @@ -14,4 +14,4 @@ image: /static/images/people/dgoulet.png --- description:

-Tor development team focusing on onion services and our torsocks maintainer. +Tor development. Member of the Network Team. diff --git a/content/about/people/egypcio/contents.lr b/content/about/people/egypcio/contents.lr index 7bb3faf4..151b1ea6 100644 --- a/content/about/people/egypcio/contents.lr +++ b/content/about/people/egypcio/contents.lr @@ -8,6 +8,8 @@ name: Vinicius Zavam --- nickname: egypcio --- +pronoun: he +--- twitter_handle: egypcio --- gpg: /static/keys/egypcio.txt diff --git a/content/about/people/eta/contents.lr b/content/about/people/eta/contents.lr new file mode 100644 index 00000000..064236ea --- /dev/null +++ b/content/about/people/eta/contents.lr @@ -0,0 +1,22 @@ +_model: person +--- +_hidden: yes +--- +role: core +--- +name: eta +--- +twitter_handle: eeeeeta9 +--- +pronoun: she/her +--- +nickname: eta +--- +gpg: https://eta.st/tor-pubkey.asc +--- +image: /static/images/people/eta.png +--- + +description: + +Member of the Network Team, working on [Arti](https://gitlab.torproject.org/tpo/core/arti). diff --git a/content/about/people/jvoisin/contents.lr b/content/about/people/jvoisin/contents.lr new file mode 100644 index 00000000..588b04e2 --- /dev/null +++ b/content/about/people/jvoisin/contents.lr @@ -0,0 +1,21 @@ +_model: person +--- +_hidden: yes +--- +role: core +--- +name: Julien Voisin +--- +twitter_handle: dustriorg +--- +pronoun: he +--- +nickname: jvoisin +--- +gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=9FCDEE9E1A381F311EA62A740... +--- +image: /static/images/people/jvoisin.jpg +--- +description: + +Sysadmin for [Nos Oignons](https://nos-oignons.net) and maintainer of [mat2](https://0xacab.org/jvoisin/mat2). diff --git a/lego b/lego index 5db6fa6d..c615f285 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b +Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7 diff --git a/templates/press.html b/templates/press.html index 2ea49a82..5a07e169 100644 --- a/templates/press.html +++ b/templates/press.html @@ -9,7 +9,7 @@ <a class="h5 text-primary" href="https://support.torproject.org/" title="Tor Project Support Portal" target="_blank">{{ _('Visit our Support Portal') }}</a> </div> <div class="row pl-3 text-tpo"> - <a class="h5 text-primary" href="https://webchat.oftc.net/" title="Tor Project IRC" target="_blank">{{ _('Ask us on #tor') }}</a> + <a class="h5 text-primary" href="https://webchat.oftc.net/?channels=tor" title="Tor Project IRC" target="_blank">{{ _('Ask us on #tor') }}</a> </div> <div class="row pl-3 text-tpo"> <a class="h5 text-primary" href="http://lists.torproject.org/" title="Tor Project Mailing List" target="_blank">{{ _('Write to a mailing list') }}</a>