commit cf7df83cdda9d7844c684f85b4ca19686e4707d8
Author: Damian Johnson <ata...@torproject.org>
Date:   Tue May 29 17:19:24 2018 -0700

    Add haxxpop to people page
    
    Adding the people page entry he requested. Image is from...
    
      https://commons.wikimedia.org/wiki/File:Haxxpop-avatar.jpg
---
 about/en/corepeople.wml        |  22 ++++++++++++-----
 images/people/haxxpop.png      | Bin 0 -> 37325 bytes
 images/people/orig/haxxpop.jpg | Bin 0 -> 61834 bytes
 keys/haxxpop.txt               |  52 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index decf2a09..3e298128 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -804,6 +804,18 @@
     </td>
 
     <td>
+      <a id="haxxpop"></a>
+      <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" 
alt="haxxpop" /></div>
+      <div class="icon"><a href="https://twitter.com/haxxpop";><img 
src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
+      <div class="icon"><a href="../keys/haxxpop.txt"><img 
src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div>
+      <div class="name"><a href="#haxxpop">Suphanat Chunhapanya</a></div>
+      <div class="field"><b>IRC:</b> haxxpop</div>
+      <div class="description">Contributes to core Tor and especially onion 
services.</div>
+    </td>
+  </tr>
+
+  <tr>
+    <td>
       <a id="catalyst"></a>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no 
photo" /></div>
       <div class="icon"><a href="https://twitter.com/argonblue";><img 
src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div>
@@ -812,9 +824,7 @@
       <div class="field"><b>IRC:</b> catalyst</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>
-  </tr>
 
-  <tr>
     <td>
       <a id="teor"></a>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no 
photo" /></div>
@@ -823,7 +833,9 @@
       <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>
       <a id="tjr"></a>
       <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" 
/></div>
@@ -833,9 +845,7 @@
       <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>
       <a id="t0mmy"></a>
       <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" 
/></div>
@@ -845,7 +855,9 @@
       <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>
       <a id="wseltzer"></a>
       <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" 
alt="wseltzer" /></div>
@@ -855,9 +867,7 @@
       <div class="field"><b>IRC:</b> wseltzer</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>
 
-  <tr>
     <td>
       <a id="yawning"></a>
       <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no 
photo" /></div>
diff --git a/images/people/haxxpop.png b/images/people/haxxpop.png
new file mode 100644
index 00000000..f2fcc4c5
Binary files /dev/null and b/images/people/haxxpop.png differ
diff --git a/images/people/orig/haxxpop.jpg b/images/people/orig/haxxpop.jpg
new file mode 100644
index 00000000..ee5f2890
Binary files /dev/null and b/images/people/orig/haxxpop.jpg differ
diff --git a/keys/haxxpop.txt b/keys/haxxpop.txt
new file mode 100644
index 00000000..bd039add
--- /dev/null
+++ b/keys/haxxpop.txt
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+6MXTdDVD1HgnSerf7ksyjU/c
+=zjud
+-----END PGP PUBLIC KEY BLOCK-----



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to