Damian Johnson commited on 2017-07-10 06:45:22
Zeige 1 geänderte Dateien mit 22 Einfügungen und 22 Löschungen.
Oops, copy-paste bug caused them all to say 'twitter'.
... | ... |
@@ -57,7 +57,7 @@ table.people tr td:first-child { |
57 | 57 |
<td> |
58 | 58 |
<div class="photo"><img src="$(IMGROOT)/people/ohmygodel.png" alt="ohmygodel" /></div> |
59 | 59 |
<div class="icon"><a href="https://twitter.com/ohmygodel"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
60 |
- <div class="icon"><a href="../keys/ohmygodel.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
60 |
+ <div class="icon"><a href="../keys/ohmygodel.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
61 | 61 |
<div class="name">Aaron Johnson</div> |
62 | 62 |
<div class="field"><b>IRC:</b> ohmygodel</div> |
63 | 63 |
<div class="description"><a href="https://www.nrl.navy.mil/">NRL</a> researcher in applied cryptography with an interest in Tor’s security and privacy.</div> |
... | ... |
@@ -66,7 +66,7 @@ table.people tr td:first-child { |
66 | 66 |
<td> |
67 | 67 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
68 | 68 |
<div class="icon"><a href="https://twitter.com/ahfaeroey"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
69 |
- <div class="icon"><a href="../keys/ahf.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
69 |
+ <div class="icon"><a href="../keys/ahf.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
70 | 70 |
<div class="name">Alexander Færøy</div> |
71 | 71 |
<div class="field"><b>IRC:</b> ahf</div> |
72 | 72 |
<div class="description">Works on core Tor development.</div> |
... | ... |
@@ -77,7 +77,7 @@ table.people tr td:first-child { |
77 | 77 |
<td> |
78 | 78 |
<div class="photo"><img src="$(IMGROOT)/people/flexlibris.png" alt="flexlibris" /></div> |
79 | 79 |
<div class="icon"><a href="https://twitter.com/flexlibris"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
80 |
- <div class="icon"><a href="../keys/flexlibris.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
80 |
+ <div class="icon"><a href="../keys/flexlibris.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
81 | 81 |
<div class="name">Alison Macrina</div> |
82 | 82 |
<div class="field"><b>IRC:</b> flexlibris</div> |
83 | 83 |
<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> |
... | ... |
@@ -86,7 +86,7 @@ table.people tr td:first-child { |
86 | 86 |
<td> |
87 | 87 |
<div class="photo"><img src="$(IMGROOT)/people/gunner.png" alt="gunner" /></div> |
88 | 88 |
<div class="icon"><a href="https://twitter.com/allengunn"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
89 |
- <div class="icon"><a href="../keys/gunner.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
89 |
+ <div class="icon"><a href="../keys/gunner.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
90 | 90 |
<div class="name">Allen Gunn</div> |
91 | 91 |
<div class="field"><b>IRC:</b> gunner</div> |
92 | 92 |
<div class="description"><a href="https://aspirationtech.org/about/people/gunner">Executive Director of Aspiration</a>, where he works with NGOs, activists, and human rights groups. Meeting facilitator and member of Tor's Community Council.</div> |
... | ... |
@@ -96,7 +96,7 @@ table.people tr td:first-child { |
96 | 96 |
<tr> |
97 | 97 |
<td> |
98 | 98 |
<div class="photo"><img src="$(IMGROOT)/people/arthuredelstein.png" alt="arthuredelstein" /></div> |
99 |
- <div class="icon"><a href="../keys/arthuredelstein.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
99 |
+ <div class="icon"><a href="../keys/arthuredelstein.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
100 | 100 |
<div class="name">Arthur Edelstein</div> |
101 | 101 |
<div class="field"><b>IRC:</b> arthuredelstein</div> |
102 | 102 |
<div class="description">Works on Tor Browser.</div> |
... | ... |
@@ -105,7 +105,7 @@ table.people tr td:first-child { |
105 | 105 |
<td> |
106 | 106 |
<div class="photo"><img src="$(IMGROOT)/people/hellais.png" alt="hellais" /></div> |
107 | 107 |
<div class="icon"><a href="https://twitter.com/hellais"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
108 |
- <div class="icon"><a href="../keys/hellais.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
108 |
+ <div class="icon"><a href="../keys/hellais.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
109 | 109 |
<div class="name">Arturo Filastò</div> |
110 | 110 |
<div class="field"><b>IRC:</b> hellais</div> |
111 | 111 |
<div class="description">Project leader for <a href="https://ooni.torproject.org/">OONI</a>, has helped with <a href="http://tor2web.org/">tor2web</a>, wrote <a href="https://atlas.torproject.org/">Atlas</a>, and helps improve security.</div> |
... | ... |
@@ -116,7 +116,7 @@ table.people tr td:first-child { |
116 | 116 |
<td> |
117 | 117 |
<div class="photo"><img src="$(IMGROOT)/people/phoul.png" alt="phoul" /></div> |
118 | 118 |
<div class="icon"><a href="https://twitter.com/Phoul"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
119 |
- <div class="icon"><a href="../keys/phoul.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
119 |
+ <div class="icon"><a href="../keys/phoul.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
120 | 120 |
<div class="name">Colin Childs</div> |
121 | 121 |
<div class="field"><b>IRC:</b> Phoul</div> |
122 | 122 |
<div class="description">Support and translation coordinator, GSoC administrator, member of the community team and a director of <a href="https://www.coldhak.ca">Coldhak</a>.</div> |
... | ... |
@@ -124,7 +124,7 @@ table.people tr td:first-child { |
124 | 124 |
|
125 | 125 |
<td> |
126 | 126 |
<div class="photo"><img src="$(IMGROOT)/people/atagar.png" alt="atagar" /></div> |
127 |
- <div class="icon"><a href="../keys/atagar.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
127 |
+ <div class="icon"><a href="../keys/atagar.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
128 | 128 |
<div class="name">Damian Johnson</div> |
129 | 129 |
<div class="field"><b>IRC:</b> atagar</div> |
130 | 130 |
<div class="description">Author of the <a href="https://stem.torproject.org/">Stem</a> python controller library and <a href="https://www.atagar.com/arm/">Nyx</a> relay monitor.</div> |
... | ... |
@@ -134,7 +134,7 @@ table.people tr td:first-child { |
134 | 134 |
<tr> |
135 | 135 |
<td> |
136 | 136 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
137 |
- <div class="icon"><a href="../keys/dgoulet.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
137 |
+ <div class="icon"><a href="../keys/dgoulet.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
138 | 138 |
<div class="name">David Goulet</div> |
139 | 139 |
<div class="field"><b>IRC:</b> dgoulet</div> |
140 | 140 |
<div class="description">Core member of Tor development team.</div> |
... | ... |
@@ -143,7 +143,7 @@ table.people tr td:first-child { |
143 | 143 |
<td> |
144 | 144 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
145 | 145 |
<div class="icon"><a href="https://twitter.com/david415"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
146 |
- <div class="icon"><a href="../keys/dawuud.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
146 |
+ <div class="icon"><a href="../keys/dawuud.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
147 | 147 |
<div class="name"><a href="https://github.com/david415/">David Stainton</a></div> |
148 | 148 |
<div class="field"><b>IRC:</b> dawuud</div> |
149 | 149 |
<div class="description">Author of roflcoptor and honeybadger. Researches mixnets and contributes to txtorcon.</div> |
... | ... |
@@ -153,7 +153,7 @@ table.people tr td:first-child { |
153 | 153 |
<tr> |
154 | 154 |
<td> |
155 | 155 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
156 |
- <div class="icon"><a href="../keys/geko.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
156 |
+ <div class="icon"><a href="../keys/geko.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
157 | 157 |
<div class="name">Georg Koppen</div> |
158 | 158 |
<div class="field"><b>IRC:</b> GeKo</div> |
159 | 159 |
<div class="description">Currently lead of the Tor Browser team.</div> |
... | ... |
@@ -161,7 +161,7 @@ table.people tr td:first-child { |
161 | 161 |
|
162 | 162 |
<td> |
163 | 163 |
<div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div> |
164 |
- <div class="icon"><a href="../keys/ian.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
164 |
+ <div class="icon"><a href="../keys/ian.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
165 | 165 |
<div class="name"><a href="https://cs.uwaterloo.ca/~iang/">Ian Goldberg</a></div> |
166 | 166 |
<div class="description"><a href="https://crysp.uwaterloo.ca/">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> |
167 | 167 |
</td> |
... | ... |
@@ -170,7 +170,7 @@ table.people tr td:first-child { |
170 | 170 |
<tr> |
171 | 171 |
<td> |
172 | 172 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
173 |
- <div class="icon"><a href="https://gaffer.ptitcanardnoir.org/intrigeri/contact/"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
173 |
+ <div class="icon"><a href="https://gaffer.ptitcanardnoir.org/intrigeri/contact/"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
174 | 174 |
<div class="name">intrigeri</div> |
175 | 175 |
<div class="description">Our main interface with the <a href="https://tails.boum.org/">Tails</a> project.</div> |
176 | 176 |
</td> |
... | ... |
@@ -192,7 +192,7 @@ table.people tr td:first-child { |
192 | 192 |
<td> |
193 | 193 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
194 | 194 |
<div class="icon"><a href="https://twitter.com/qbi"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
195 |
- <div class="icon"><a href="../keys/qbi.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
195 |
+ <div class="icon"><a href="../keys/qbi.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
196 | 196 |
<div class="name">Jens Kubieziel</div> |
197 | 197 |
<div class="field"><b>IRC:</b> qbi</div> |
198 | 198 |
<div class="description">Volunteer that helped translate the website, is part of TorServers.net, and Tor's sysadmin team.</div> |
... | ... |
@@ -203,14 +203,14 @@ table.people tr td:first-child { |
203 | 203 |
<td> |
204 | 204 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
205 | 205 |
<div class="icon"><a href="https://twitter.com/mittenzwei"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
206 |
- <div class="icon"><a href="../keys/julius.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
206 |
+ <div class="icon"><a href="../keys/julius.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
207 | 207 |
<div class="name">Julius Mittenzwei</div> |
208 | 208 |
<div class="description">Germany-based lawyer and Internet activist.</div> |
209 | 209 |
</td> |
210 | 210 |
|
211 | 211 |
<td> |
212 | 212 |
<div class="photo"><img src="$(IMGROOT)/people/karsten.png" alt="karsten" /></div> |
213 |
- <div class="icon"><a href="../keys/karsten.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
213 |
+ <div class="icon"><a href="../keys/karsten.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
214 | 214 |
<div class="name">Karsten Loesing</div> |
215 | 215 |
<div class="field"><b>IRC:</b> karsten</div> |
216 | 216 |
<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> |
... | ... |
@@ -236,7 +236,7 @@ table.people tr td:first-child { |
236 | 236 |
<tr> |
237 | 237 |
<td> |
238 | 238 |
<div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div> |
239 |
- <div class="icon"><a href="../keys/pastly.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
239 |
+ <div class="icon"><a href="../keys/pastly.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
240 | 240 |
<div class="name"><a href="http://mattttttssi4lhud.onion/">Matt Traudt</a></div> |
241 | 241 |
<div class="field"><b>IRC:</b> pastly</div> |
242 | 242 |
<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> |
... | ... |
@@ -245,7 +245,7 @@ table.people tr td:first-child { |
245 | 245 |
<td> |
246 | 246 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
247 | 247 |
<div class="icon"><a href="https://twitter.com/mrphs"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
248 |
- <div class="icon"><a href="../keys/mrphs.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
248 |
+ <div class="icon"><a href="../keys/mrphs.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
249 | 249 |
<div class="name">Nima Fatemi</div> |
250 | 250 |
<div class="field"><b>IRC:</b> mrphs</div> |
251 | 251 |
<div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> |
... | ... |
@@ -256,7 +256,7 @@ table.people tr td:first-child { |
256 | 256 |
<td> |
257 | 257 |
<div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> |
258 | 258 |
<div class="icon"><a href="https://twitter.com/robgjansen"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
259 |
- <div class="icon"><a href="../keys/robgjansen.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
259 |
+ <div class="icon"><a href="../keys/robgjansen.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
260 | 260 |
<div class="name"><a href="http://www.robgjansen.com/">Rob Jansen</a></div> |
261 | 261 |
<div class="field"><b>IRC:</b> robgjansen</div> |
262 | 262 |
<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> |
... | ... |
@@ -272,7 +272,7 @@ table.people tr td:first-child { |
272 | 272 |
<tr> |
273 | 273 |
<td> |
274 | 274 |
<div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> |
275 |
- <div class="icon"><a href="../keys/teor.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
275 |
+ <div class="icon"><a href="../keys/teor.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
276 | 276 |
<div class="name">Tim Wilson-Brown</div> |
277 | 277 |
<div class="field"><b>IRC:</b> teor</div> |
278 | 278 |
<div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> |
... | ... |
@@ -281,7 +281,7 @@ table.people tr td:first-child { |
281 | 281 |
<td> |
282 | 282 |
<div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> |
283 | 283 |
<div class="icon"><a href="https://twitter.com/tomrittervg"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> |
284 |
- <div class="icon"><a href="../keys/tjr.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
284 |
+ <div class="icon"><a href="../keys/tjr.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
285 | 285 |
<div class="name">Tom Ritter</div> |
286 | 286 |
<div class="field"><b>IRC:</b> tjr</div> |
287 | 287 |
<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> |
... | ... |
@@ -291,7 +291,7 @@ table.people tr td:first-child { |
291 | 291 |
<tr> |
292 | 292 |
<td> |
293 | 293 |
<div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> |
294 |
- <div class="icon"><a href="../keys/t0mmy.txt"><img src="$(IMGROOT)/pgp-key.png" alt="twitter" /></a></div> |
|
294 |
+ <div class="icon"><a href="../keys/t0mmy.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> |
|
295 | 295 |
<div class="name">Tommy Collison</div> |
296 | 296 |
<div class="field"><b>IRC:</b> t0mmy</div> |
297 | 297 |
<div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> |
298 | 298 |