[webwml/staging] Add Mark - tor-commits

27 Jul 2017

commit f7e2b71579242d4f59c7f47ddde5b3c28b207d9c
Author: Damian Johnson atagar@torproject.org
Date:   Mon Jul 10 11:10:43 2017 -0700
Add Mark
---
 about/en/corepeople_alternate.wml |  28 ++++++++++++++++++----------
 images/people/mcs.png             | Bin 0 -> 30521 bytes
 keys/mcs.txt                      |  29 +++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/about/en/corepeople_alternate.wml b/about/en/corepeople_alternate.wml
index e22a6d63..ba7e7eb5 100644
--- a/about/en/corepeople_alternate.wml
+++ b/about/en/corepeople_alternate.wml
@@ -236,12 +236,22 @@ table.people tr td:first-child {
<tr>
     <td>
+      <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div>
+      <div class="icon"><a href="../keys/mcs.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
+      <div class="name">Mark Smith</div>
+      <div class="field"><b>IRC:</b> mcs</div>
+      <div class="description">Developer on the Tor Browser team.</div>
+    </td>
+
+    <td>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
       <div class="icon"><a href="https://twitter.com/mattblaze"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
       <div class="name">Matt Blaze</div>
       <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div>
     </td>
+  </tr>
+  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div>
       <div class="icon"><a href="../keys/pastly.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
@@ -249,9 +259,7 @@ table.people tr td:first-child {
       <div class="field"><b>IRC:</b> pastly</div>
       <div class="description">Implemented the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. Helps safely measure Tor. Says helpful things on IRC.</div>
     </td>
-  </tr>
-  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
       <div class="icon"><a href="https://twitter.com/mrphs"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
@@ -260,7 +268,9 @@ table.people tr td:first-child {
       <div class="field"><b>IRC:</b> mrphs</div>
       <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div>
     </td>
+  </tr>
+  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div>
       <div class="icon"><a href="https://twitter.com/robgjansen"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
@@ -269,15 +279,15 @@ table.people tr td:first-child {
       <div class="field"><b>IRC:</b> robgjansen</div>
       <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, leading expert in Tor network performance, and author of <a href="https://shadow.github.io/">Shadow</a>.</div>
     </td>
-  </tr>
-  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
       <div class="name">Sebastian Hahn</div>
       <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div>
     </td>
+  </tr>
+  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div>
       <div class="icon"><a href="https://twitter.com/nopressure"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
@@ -286,9 +296,7 @@ table.people tr td:first-child {
       <div class="field"><b>IRC:</b> hiro</div>
       <div class="description">Hiro builds and runs Tor Project's web applications and services.</div>
     </td>
-  </tr>
-  <tr>
     <td>
       <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>
@@ -297,7 +305,9 @@ table.people tr td:first-child {
       <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>
     </td>
+  </tr>
+  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
       <div class="icon"><a href="../keys/teor.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
@@ -305,9 +315,7 @@ table.people tr td:first-child {
       <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>
     </td>
-  </tr>
-  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div>
       <div class="icon"><a href="https://twitter.com/tomrittervg"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
@@ -316,7 +324,9 @@ table.people tr td:first-child {
       <div class="field"><b>IRC:</b> tjr</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>
+  </tr>
+  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>
       <div class="icon"><a href="../keys/t0mmy.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
@@ -324,9 +334,7 @@ table.people tr td:first-child {
       <div class="field"><b>IRC:</b> t0mmy</div>
       <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div>
     </td>
-  </tr>
-  <tr>
     <td>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
       <div class="name">Yawning Angel</div>
diff --git a/images/people/mcs.png b/images/people/mcs.png
new file mode 100644
index 00000000..27872e7d
Binary files /dev/null and b/images/people/mcs.png differ
diff --git a/keys/mcs.txt b/keys/mcs.txt
new file mode 100644
index 00000000..a167596b
--- /dev/null
+++ b/keys/mcs.txt
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFD+7bEBCADbYcN0fbYoGZtLjBMTZEOF/DhBUKxNDueVhYb330vCg89vKAZE
+Efq0rOkhVoMPDLQHskLRlsugkyxaERtU4m45kyWoY2OjHRbOJHzDrTGQ5oqxT0eP
+S5l741NzxXUO9rHM9LA74VR6t+Ay5U8lQhv8y1qUnhJVObsxeoQsg8niUmT6MYH3
+zHkTwaihpNKIjItmJ69hMHuUN/ga8wyCRCT+Rx2JD1KJjD+nIuXd6mjTgFl9AGEq
+HkowsMad9lublej+A+LksnpQmN503sDsDUFsDo09Rh1Oalfpkf6VYQamnbSou0Y3
+dVbuFVo3fN4a30CqqXVJX5tIFiO1AVK0PGEhABEBAAG0Ik1hcmsgU21pdGggPG1j
+c0BwZWFybGNyZXNjZW50LmNvbT6JATgEEwECACIFAlD+7bECGwMGCwkIBwMCBhUI
+AgkKCwQWAgMBAh4BAheAAAoJEA42Ek+OmQ9us/cH/1b3dYnTZjTVz3JV4TGWIp3G
+z28fJJPstq/07BL/hKa+8M+FKLA5BHdWQNmSURALXdUiO4lSpQujvN6VQH0XIc3P
+hQ2qNWPDtttfsp5YOqpqePEtSTrnzwcrUJcJ2aJ5dZTrxmMkuGbqKOe+TF2vio+N
+LZP9Rs08N0Iy04iPWWtHKDXEMSXPdaH8kIWFdOp3tEFTC5KGkBlGuaNQoosWapFM
+tt8mHoEJSigkuhXzTuJaK/7a5HdqON/IhLqA1lvOB2ZRn6P5+Lc+vwVYKrNFxyoC
+sOi1Wm5C2Mykn5YpbXczhZNSpH9C5NLMEvoElFFw9b5EN7gQW8FVcfAUW4AaiGK5
+AQ0EUP7tsQEIAMmL0rVg2tWdnRlyVYWqOAnF/Z1kjwAjgj5YfHmH3aM5hBqlIYrT
+wz2QujSA98P5jMvTVVH4FYNIx8j82P4MBfR3izCi02g+UxLsmWgy3adpF0BhrV2b
+kReGCnBofn+bYwr1rZhK6EMwe6rush1t5LDirN+Rw4b0a1lp1B0c7BZUkktzmb0h
+1dlvTETKAbI/8pdQ8JKfb2nONWFLhTflWimZRIpBO3R1zZPOFh95VR5IfUj5s1k9
+ddOSGsOb94RoesH+HQoz+NniJaOfzjX7ye/aeM+f5lG9pL2vQ7sz+4aVz51gjwAg
+z7aU/nJgnjBNaqpH1OGmvN+TnmpcWITrhC8AEQEAAYkBHwQYAQIACQUCUP7tsQIb
+DAAKCRAONhJPjpkPbhq4B/wNlB0lnh7WtxQTMmVH4B+xSAz2m2IZ8y1vBhkefwr4
+fRhjcIqTSr29cIzd/grgqBN828v10KHrspytr8P1gIPf1IdFNTRiM3kpxFN3J5Ex
+UzJQe9eK6FaBGm5qe0KyTEW6lGsdeuAUvpkg5f8WZdjKb+4PvmyGApiUZ8UjR8gy
+gLfT+ZL4rZPRq+Mp4/S+FZNOISc1JZUSkcUioc4h4CVb4zAz/aD1guSVf6DEJW9Y
+U1ZAkcr7w6juWM5jNnZjmC0xDfSRlhC7I5IjZtkYKiFhsrxObYWTWT8UY4GEH0X8
+ywyjaZBvmzr4TmuKuEFNK0B5PgEt5YRwrdVvPbbzOLgc
+=MBCV
+-----END PGP PUBLIC KEY BLOCK-----

    