Browse code

Add Mark

Damian Johnson authored on10/07/2017 20:10:43
Showing3 changed files
... ...
@@ -235,13 +235,23 @@ table.people tr td:first-child {
235 235
   </tr>
236 236
 
237 237
   <tr>
238
+    <td>
239
+      <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div>
240
+      <div class="icon"><a href="../keys/mcs.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
241
+      <div class="name">Mark Smith</div>
242
+      <div class="field"><b>IRC:</b> mcs</div>
243
+      <div class="description">Developer on the Tor Browser team.</div>
244
+    </td>
245
+
238 246
     <td>
239 247
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
240 248
       <div class="icon"><a href="https://twitter.com/mattblaze"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
241 249
       <div class="name">Matt Blaze</div>
242 250
       <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div>
243 251
     </td>
252
+  </tr>
244 253
 
254
+  <tr>
245 255
     <td>
246 256
       <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div>
247 257
       <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 {
249 259
       <div class="field"><b>IRC:</b> pastly</div>
250 260
       <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>
251 261
     </td>
252
-  </tr>
253 262
 
254
-  <tr>
255 263
     <td>
256 264
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
257 265
       <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 {
260 268
       <div class="field"><b>IRC:</b> mrphs</div>
261 269
       <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div>
262 270
     </td>
271
+  </tr>
263 272
 
273
+  <tr>
264 274
     <td>
265 275
       <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div>
266 276
       <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 {
269 279
       <div class="field"><b>IRC:</b> robgjansen</div>
270 280
       <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>
271 281
     </td>
272
-  </tr>
273 282
 
274
-  <tr>
275 283
     <td>
276 284
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
277 285
       <div class="name">Sebastian Hahn</div>
278 286
       <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>
279 287
     </td>
288
+  </tr>
280 289
 
290
+  <tr>
281 291
     <td>
282 292
       <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div>
283 293
       <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 {
286 296
       <div class="field"><b>IRC:</b> hiro</div>
287 297
       <div class="description">Hiro builds and runs Tor Project's web applications and services.</div>
288 298
     </td>
289
-  </tr>
290 299
 
291
-  <tr>
292 300
     <td>
293 301
       <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div>
294 302
       <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 {
297 305
       <div class="field"><b>IRC:</b> sjmurdoch</div>
298 306
       <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>
299 307
     </td>
308
+  </tr>
300 309
 
310
+  <tr>
301 311
     <td>
302 312
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
303 313
       <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 {
305 315
       <div class="field"><b>IRC:</b> teor</div>
306 316
       <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div>
307 317
     </td>
308
-  </tr>
309 318
 
310
-  <tr>
311 319
     <td>
312 320
       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div>
313 321
       <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 {
316 324
       <div class="field"><b>IRC:</b> tjr</div>
317 325
       <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>
318 326
     </td>
327
+  </tr>
319 328
 
329
+  <tr>
320 330
     <td>
321 331
       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div>
322 332
       <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 {
324 334
       <div class="field"><b>IRC:</b> t0mmy</div>
325 335
       <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div>
326 336
     </td>
327
-  </tr>
328 337
 
329
-  <tr>
330 338
     <td>
331 339
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div>
332 340
       <div class="name">Yawning Angel</div>
333 341
new file mode 100644
334 342
Binary files /dev/null and b/images/people/mcs.png differ
335 343
new file mode 100644
... ...
@@ -0,0 +1,29 @@
1
+-----BEGIN PGP PUBLIC KEY BLOCK-----
2
+
3
+mQENBFD+7bEBCADbYcN0fbYoGZtLjBMTZEOF/DhBUKxNDueVhYb330vCg89vKAZE
4
+Efq0rOkhVoMPDLQHskLRlsugkyxaERtU4m45kyWoY2OjHRbOJHzDrTGQ5oqxT0eP
5
+S5l741NzxXUO9rHM9LA74VR6t+Ay5U8lQhv8y1qUnhJVObsxeoQsg8niUmT6MYH3
6
+zHkTwaihpNKIjItmJ69hMHuUN/ga8wyCRCT+Rx2JD1KJjD+nIuXd6mjTgFl9AGEq
7
+HkowsMad9lublej+A+LksnpQmN503sDsDUFsDo09Rh1Oalfpkf6VYQamnbSou0Y3
8
+dVbuFVo3fN4a30CqqXVJX5tIFiO1AVK0PGEhABEBAAG0Ik1hcmsgU21pdGggPG1j
9
+c0BwZWFybGNyZXNjZW50LmNvbT6JATgEEwECACIFAlD+7bECGwMGCwkIBwMCBhUI
10
+AgkKCwQWAgMBAh4BAheAAAoJEA42Ek+OmQ9us/cH/1b3dYnTZjTVz3JV4TGWIp3G
11
+z28fJJPstq/07BL/hKa+8M+FKLA5BHdWQNmSURALXdUiO4lSpQujvN6VQH0XIc3P
12
+hQ2qNWPDtttfsp5YOqpqePEtSTrnzwcrUJcJ2aJ5dZTrxmMkuGbqKOe+TF2vio+N
13
+LZP9Rs08N0Iy04iPWWtHKDXEMSXPdaH8kIWFdOp3tEFTC5KGkBlGuaNQoosWapFM
14
+tt8mHoEJSigkuhXzTuJaK/7a5HdqON/IhLqA1lvOB2ZRn6P5+Lc+vwVYKrNFxyoC
15
+sOi1Wm5C2Mykn5YpbXczhZNSpH9C5NLMEvoElFFw9b5EN7gQW8FVcfAUW4AaiGK5
16
+AQ0EUP7tsQEIAMmL0rVg2tWdnRlyVYWqOAnF/Z1kjwAjgj5YfHmH3aM5hBqlIYrT
17
+wz2QujSA98P5jMvTVVH4FYNIx8j82P4MBfR3izCi02g+UxLsmWgy3adpF0BhrV2b
18
+kReGCnBofn+bYwr1rZhK6EMwe6rush1t5LDirN+Rw4b0a1lp1B0c7BZUkktzmb0h
19
+1dlvTETKAbI/8pdQ8JKfb2nONWFLhTflWimZRIpBO3R1zZPOFh95VR5IfUj5s1k9
20
+ddOSGsOb94RoesH+HQoz+NniJaOfzjX7ye/aeM+f5lG9pL2vQ7sz+4aVz51gjwAg
21
+z7aU/nJgnjBNaqpH1OGmvN+TnmpcWITrhC8AEQEAAYkBHwQYAQIACQUCUP7tsQIb
22
+DAAKCRAONhJPjpkPbhq4B/wNlB0lnh7WtxQTMmVH4B+xSAz2m2IZ8y1vBhkefwr4
23
+fRhjcIqTSr29cIzd/grgqBN828v10KHrspytr8P1gIPf1IdFNTRiM3kpxFN3J5Ex
24
+UzJQe9eK6FaBGm5qe0KyTEW6lGsdeuAUvpkg5f8WZdjKb+4PvmyGApiUZ8UjR8gy
25
+gLfT+ZL4rZPRq+Mp4/S+FZNOISc1JZUSkcUioc4h4CVb4zAz/aD1guSVf6DEJW9Y
26
+U1ZAkcr7w6juWM5jNnZjmC0xDfSRlhC7I5IjZtkYKiFhsrxObYWTWT8UY4GEH0X8
27
+ywyjaZBvmzr4TmuKuEFNK0B5PgEt5YRwrdVvPbbzOLgc
28
+=MBCV
29
+-----END PGP PUBLIC KEY BLOCK-----