June 2018 - tor-commits - lists.torproject.org

[user-manual/alpha] Use itstool instead of xml2po
by colin＠torproject.org 21 Jun '18

21 Jun '18

commit 39a82c3a4b6bc0bf59a7611776d3f9b82a84d6a0 Author: Colin Childs <colin(a)torproject.org> Date: Thu Jun 21 14:47:54 2018 -0500 Use itstool instead of xml2po --- README | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README b/README index 8d14304..6143f11 100644 --- a/README +++ b/README @@ -23,7 +23,11 @@ Build: Generating the .POT file for localization ----------------------------------------- -xml2po -o tor-browser-user-manual.pot -m mallard ./C/*.page +Generate .pot file from .page files: +(From the C/ directory) itstool -o ../tor-browser-manual.pot *.page + +Remove the itstool spam from .pot file: +(From the base directory) sed -i '/itstool/d' tor-browser-manual.pot Ressources ----------

1 0

[webwml/master] Adjust teor' people page entry
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit 8abebffcde8d23a435b69e0aaf6de77ecc36c73f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 11:03:19 2018 -0700 Adjust teor' people page entry Dropping their name and adjusting the description per their request. --- about/en/corepeople.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 61b9e34c..1fa7ac9e 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -828,9 +828,9 @@ <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> - <div class="name"><a href="#teor">Tim Wilson-Brown</a></div> + <div class="name"><a href="#teor">teor</a></div> <div class="field"><b>IRC:</b> teor</div> - <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> + <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div> </td> </tr>

1 0

[webwml/master] Drop Isis' middle name
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit 83b90b6430b18aee0b0ef3a35e05ffb1061032c2 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 12:44:23 2018 -0700 Drop Isis' middle name With the addition of pronouns the only entry to overflow is isis. They asked for a longer description and to include their middle name but we can't do both. We can re-add their middle name if they shorten their burb. --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 5fcb619e..c3f3bd19 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -346,7 +346,7 @@ <div class="photo"><img src="$(IMGROOT)/people/isis.png" alt="isis" /></div> <div class="icon"><a href="https://twitter.com/isislovecruft"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> <div class="icon"><a href="https://fyb.patternsinthevoid.net/isis.html"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> - <div class="name"><a href="#isis">Isis Agora Lovecruft</a></div> + <div class="name"><a href="#isis">Isis Lovecruft</a></div> <div class="field"><b>IRC:</b> isis</div> <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">isis works as a C and Rust developer on the Tor network daemon. They tend to focus on security, censorship circumvention, and cryptographic research and implementation.</div>

1 0

[webwml/master] Add pronouns to the people page
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit 4a591306bec225069096a4475a040d2ea962e1e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 12:41:32 2018 -0700 Add pronouns to the people page Proposed and information collected by Tom... https://lists.torproject.org/pipermail/tor-project/2018-May/001776.html --- about/en/corepeople.wml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 1fa7ac9e..5fcb619e 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -31,6 +31,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=FDB16F45A477B314E87432EC…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#ahf">Alexander Færøy</a></div> <div class="field"><b>IRC:</b> ahf</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on core Tor development.</div> </td> </tr> @@ -43,6 +44,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=FBF0E7DB1433018EE52D0DDA…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#flexlibris">Alison Macrina</a></div> <div class="field"><b>IRC:</b> flexlibris</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Leads the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a> and <a href="https://libraryfreedomproject.org">Library Freedom Project</a>. Works on support, outreach, and training.</div> </td> @@ -146,6 +148,7 @@ <div class="photo"><img src="$(IMGROOT)/people/cindy.png" alt="cindy" /></div> <div class="icon"><a href="https://www.eff.org/files/key_cindy.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#cindy">Cindy Cohn</a></div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Tor Board member and <a href="https://www.eff.org/about/staff/cindy-cohn">Executive Director of the EFF</a>. Lawyer by training, <a href="https://blog.torproject.org/blog/tor-heart-notes-board-member">her focus</a> is on making sure Tor stays available and that Tor users stay safe.</div> </td> @@ -167,6 +170,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=68278CC5DD2D1E85C4E45AD9…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#atagar">Damian Johnson</a></div> <div class="field"><b>IRC:</b> atagar</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Author of the <a href="https://stem.torproject.org/">Stem</a> python controller library and <a href="https://nyx.torproject.org/">Nyx</a> relay monitor.</div> </td> @@ -300,6 +304,7 @@ <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div> <div class="icon"><a href="../keys/ian.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#ian">Ian Goldberg</a></div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://cs.uwaterloo.ca/~iang/">Professor of CS</a> at the <a href="https://uwaterloo.ca/">University of Waterloo</a>, developing <a href="https://otr.cypherpunks.ca/">Off-the-Record Messaging</a> among other things.</div> </td> </tr> @@ -320,6 +325,7 @@ <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="icon"><a href="https://gaffer.ptitcanardnoir.org/intrigeri/contact/"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#intrigeri">intrigeri</a></div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">He is one of our main interfaces with the <a href="https://tails.boum.org/">Tails</a> project.</div> </td> </tr> @@ -342,6 +348,7 @@ <div class="icon"><a href="https://fyb.patternsinthevoid.net/isis.html"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#isis">Isis Agora Lovecruft</a></div> <div class="field"><b>IRC:</b> isis</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">isis works as a C and Rust developer on the Tor network daemon. They tend to focus on security, censorship circumvention, and cryptographic research and implementation.</div> </td> </tr> @@ -433,6 +440,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=0CC8157C2578EEE92B0745D6…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#karsten">Karsten Loesing</a></div> <div class="field"><b>IRC:</b> karsten</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Primary researcher and developer into <a href="https://metrics.torproject.org/">anonymous metrics</a> which started as a National Science Foundation grant.</div> </td> @@ -442,6 +450,7 @@ <div class="icon"><a href="../keys/kat.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#kat5">Kat</a></div> <div class="field"><b>IRC:</b> kat5</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Volunteer on the Community Team. Helps with t-shirts for relay operators and other odds and ends.</div> </td> </tr> @@ -482,6 +491,7 @@ <div class="icon"><a href="../keys/agrabeli.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#agrabeli">Maria Xynou</a></div> <div class="field"><b>IRC:</b> agrabeli</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div> </td> </tr> @@ -493,6 +503,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=2602B0DD0EB238CCE037196A…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#mcs">Mark Smith</a></div> <div class="field"><b>IRC:</b> mcs</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Developer on the Tor Browser team.</div> </td> @@ -583,6 +594,7 @@ <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> <div class="name"><a href="#nickhopper">Nick Hopper</a></div> <div class="field"><b>IRC:</b> nickhopper</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> </tr> @@ -595,6 +607,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=2133BC600AB133E1D826D173…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#nickm">Nick Mathewson</a></div> <div class="field"><b>IRC:</b> nickm</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> @@ -604,6 +617,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=6AB6AEE9776E782723C8ACE8…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#boklm">Nicolas Vigier</a></div> <div class="field"><b>IRC:</b> boklm</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser.</div> </td> </tr> @@ -745,6 +759,7 @@ <div class="icon"><a href="../keys/ssteele.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#ssteele">Shari Steele</a></div> <div class="field"><b>IRC:</b> ssteele</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> </tr> @@ -788,6 +803,7 @@ <div class="icon"><a href="https://twitter.com/sjmurdoch"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> <div class="name"><a href="#sjmurdoch">Steven Murdoch</a></div> <div class="field"><b>IRC:</b> sjmurdoch</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div> </td> </tr> @@ -821,6 +837,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=2C732B1C0DBEF678AB3AF606…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#catalyst">Taylor Yu</a></div> <div class="field"><b>IRC:</b> catalyst</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> @@ -830,6 +847,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=C8556CED5D90A0C529F64D43…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#teor">teor</a></div> <div class="field"><b>IRC:</b> teor</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div> </td> </tr> @@ -842,6 +860,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=8ACD146EA94CEB12E4EA6915…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#tjr">Tom Ritter</a></div> <div class="field"><b>IRC:</b> tjr</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> @@ -874,6 +893,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=4263006A4506740FAD871430…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#wseltzer">Wendy Seltzer</a></div> <div class="field"><b>IRC:</b> wseltzer</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> </tr>

1 0

[webwml/master] Add pronouns to the people page
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit 2867ba62433ec8c9f4f92f9079168b59f281c3ce Merge: 49eec96a 83b90b64 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 12:46:44 2018 -0700 Add pronouns to the people page Proposed and information collected by Tom. Quite a few other changes were requested at the same time... https://lists.torproject.org/pipermail/tor-project/2018-May/001776.html about/en/corepeople.wml | 46 ++++++++++++++++++++++++++++++------------- images/people/ilv.png | Bin 38009 -> 0 bytes images/people/isis.png | Bin 36028 -> 38311 bytes images/people/linda.png | Bin 40598 -> 0 bytes images/people/orig/isis.jpg | Bin 46059 -> 27804 bytes images/people/orig/linda.jpg | Bin 910787 -> 0 bytes 6 files changed, 32 insertions(+), 14 deletions(-)

1 0

[webwml/master] Change Cindy's description to third person
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit 9f73a34662697bba0a3b592187dd2505767e7c3c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 10:40:31 2018 -0700 Change Cindy's description to third person Requested by Cindy. --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index e704aeed..bbcfccd8 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -146,7 +146,7 @@ <div class="photo"><img src="$(IMGROOT)/people/cindy.png" alt="cindy" /></div> <div class="icon"><a href="https://www.eff.org/files/key_cindy.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#cindy">Cindy Cohn</a></div> - <div class="description">Tor Board member and <a href="https://www.eff.org/about/staff/cindy-cohn">Executive Director of the EFF</a>. Lawyer by training, <a href="https://blog.torproject.org/blog/tor-heart-notes-board-member">my focus</a> is on making sure Tor stays available and that Tor users stay safe.</div> + <div class="description">Tor Board member and <a href="https://www.eff.org/about/staff/cindy-cohn">Executive Director of the EFF</a>. Lawyer by training, <a href="https://blog.torproject.org/blog/tor-heart-notes-board-member">her focus</a> is on making sure Tor stays available and that Tor users stay safe.</div> </td> <td>

1 0

[webwml/master] Update Colin's description
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit c570209ec15ee7fa4448e30c8b6b19be0e9dbb20 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 10:42:35 2018 -0700 Update Colin's description Not sure if it'll fit, especially with pronouns, but adjusting the description as requested by Colin for the moment. We'll see how it looks. --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index bbcfccd8..fe43d596 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -156,7 +156,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=726824BE9D8D5CF009C5F039…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#Phoul">Colin Childs</a></div> <div class="field"><b>IRC:</b> Phoul</div> - <div class="description">Relay advocate, Outreachy mentor, member of the community team and a director of <a href="https://www.coldhak.ca/">Coldhak</a>.</div> + <div class="description">Relay advocate, Outreachy mentor, and a member of the community team. He is also a director of the Canadian Torservers.net partner <a href="https://www.coldhak.ca/">Coldhak</a>.</div> </td> </tr>

1 0

[webwml/master] Update intrigeri's description
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit de5e0b41871917810a971136de43aa30ecc0b96a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 10:45:30 2018 -0700 Update intrigeri's description --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index fe43d596..8b77700f 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -320,7 +320,7 @@ <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="icon"><a href="https://gaffer.ptitcanardnoir.org/intrigeri/contact/"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#intrigeri">intrigeri</a></div> - <div class="description">Our main interface with the <a href="https://tails.boum.org/">Tails</a> project.</div> + <div class="description">He is one of our main interfaces with the <a href="https://tails.boum.org/">Tails</a> project.</div> </td> </tr>

1 0

[webwml/master] Adjust isra's people page entry
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit 50bbfbf5919886f819ac5990bca4c18b4e43f558 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 10:55:17 2018 -0700 Adjust isra's people page entry Per his request dropping isra's name, photo, irc nick, and adjusting his description. --- about/en/corepeople.wml | 7 +++---- images/people/ilv.png | Bin 38009 -> 0 bytes images/people/linda.png | Bin 40598 -> 0 bytes images/people/orig/linda.jpg | Bin 910787 -> 0 bytes 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index d8fa37b7..0661fb7d 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -349,11 +349,10 @@ <tr> <td> <a id="ilv"></a> - <div class="photo"><img src="$(IMGROOT)/people/ilv.png" alt="ilv" /></div> + <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=53927C25AAF14FBBCAFABDA3…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> - <div class="name"><a href="#ilv">Israel Leiva</a></div> - <div class="field"><b>IRC:</b> ilv</div> - <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>, focused on Latin America. Works in <a href="https://www.derechosdigitales.org">Derechos Digitales</a>.</div> + <div class="name"><a href="#ilv">isra</a></div> + <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service.</div> </td> <td> diff --git a/images/people/ilv.png b/images/people/ilv.png deleted file mode 100644 index 78a47c7b..00000000 Binary files a/images/people/ilv.png and /dev/null differ diff --git a/images/people/linda.png b/images/people/linda.png deleted file mode 100644 index 9185c5e0..00000000 Binary files a/images/people/linda.png and /dev/null differ diff --git a/images/people/orig/linda.jpg b/images/people/orig/linda.jpg deleted file mode 100644 index d6a65fc6..00000000 Binary files a/images/people/orig/linda.jpg and /dev/null differ

1 0

[webwml/master] Adjust Steven's people page entry
by atagar＠torproject.org 21 Jun '18

21 Jun '18

commit d5fd709c37f27c22f850aca9c02c2a53a34093f8 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 21 11:01:52 2018 -0700 Adjust Steven's people page entry Dropping his pgp key and adjusting the description per his request. --- about/en/corepeople.wml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 0661fb7d..61b9e34c 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -786,10 +786,9 @@ <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> <div class="icon"><a href="https://twitter.com/sjmurdoch"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> - <div class="icon"><a href="http://sec.cs.ucl.ac.uk/users/smurdoch/openpgp.html"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#sjmurdoch">Steven Murdoch</a></div> <div class="field"><b>IRC:</b> sjmurdoch</div> - <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div> + <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div> </td> </tr>

1 0