commit be17fa93f73e9ccf59d2c35aaad06e6a7d803bf5 Merge: e8d695e c653f05 Author: emma peel emma.peel@riseup.net Date: Wed Mar 6 02:18:47 2019 +0100

Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging

assets/scss/_portal.scss | 2 - assets/scss/_tor.scss | 9 + assets/static/bootstrap.css | 10 +- assets/static/bootstrap.css.map | 2 +- assets/static/images/people/agrabeli.png | Bin 0 -> 29509 bytes assets/static/images/people/ailanthus.png | Bin 0 -> 40198 bytes assets/static/images/people/alsmith.png | Bin 0 -> 42933 bytes assets/static/images/people/amoghbl1.png | Bin 0 -> 11879 bytes assets/static/images/people/antonela.png | Bin 0 -> 23267 bytes assets/static/images/people/arlolra.png | Bin 0 -> 38865 bytes assets/static/images/people/arma.png | Bin 0 -> 34872 bytes assets/static/images/people/arthuredelstein.png | Bin 0 -> 37957 bytes assets/static/images/people/asn.png | Bin 0 -> 26187 bytes assets/static/images/people/atagar.png | Bin 0 -> 38415 bytes assets/static/images/people/bdavila.png | Bin 0 -> 34842 bytes assets/static/images/people/biella.png | Bin 0 -> 34947 bytes assets/static/images/people/cindy.png | Bin 0 -> 36456 bytes assets/static/images/people/dawuud.png | Bin 0 -> 22257 bytes assets/static/images/people/dgoulet.png | Bin 0 -> 14379 bytes assets/static/images/people/donnchac.png | Bin 0 -> 25035 bytes assets/static/images/people/egypcio.png | Bin 0 -> 30422 bytes assets/static/images/people/emmapeel.png | Bin 0 -> 26223 bytes assets/static/images/people/ewyatt.png | Bin 0 -> 20553 bytes assets/static/images/people/flexlibris.png | Bin 0 -> 34179 bytes assets/static/images/people/gaba.png | Bin 0 -> 36924 bytes assets/static/images/people/gunner.png | Bin 0 -> 35025 bytes assets/static/images/people/haxxpop.png | Bin 0 -> 37325 bytes assets/static/images/people/hc.png | Bin 0 -> 38444 bytes assets/static/images/people/hellais.png | Bin 0 -> 40390 bytes assets/static/images/people/hiro.png | Bin 0 -> 14842 bytes assets/static/images/people/ian.png | Bin 0 -> 40460 bytes assets/static/images/people/inf0.png | Bin 0 -> 18667 bytes assets/static/images/people/irl.png | Bin 0 -> 42121 bytes assets/static/images/people/isabela.png | Bin 0 -> 46938 bytes assets/static/images/people/jselon.png | Bin 0 -> 29698 bytes assets/static/images/people/juga.png | Bin 0 -> 14026 bytes assets/static/images/people/karsten.png | Bin 0 -> 37330 bytes assets/static/images/people/kat5.png | Bin 0 -> 53700 bytes assets/static/images/people/komlo.png | Bin 0 -> 32188 bytes assets/static/images/people/kushal.png | Bin 0 -> 30343 bytes assets/static/images/people/ln5.png | Bin 0 -> 32291 bytes assets/static/images/people/mcs.png | Bin 0 -> 30521 bytes assets/static/images/people/meejah.png | Bin 0 -> 11186 bytes assets/static/images/people/micahflee.png | Bin 0 -> 33039 bytes assets/static/images/people/moritz.png | Bin 0 -> 43049 bytes assets/static/images/people/mtigas.png | Bin 0 -> 39174 bytes assets/static/images/people/n8fr8.png | Bin 0 -> 32079 bytes assets/static/images/people/nickhopper.png | Bin 0 -> 38099 bytes assets/static/images/people/nickm.png | Bin 0 -> 41516 bytes assets/static/images/people/no_photo.png | Bin 0 -> 10668 bytes assets/static/images/people/nyinz.png | Bin 0 -> 33153 bytes assets/static/images/people/ohmygodel.png | Bin 0 -> 32230 bytes assets/static/images/people/orig/agrabeli.jpg | Bin 0 -> 19745 bytes assets/static/images/people/orig/ailanthus.jpg | Bin 0 -> 795358 bytes assets/static/images/people/orig/alsmith.jpg | Bin 0 -> 267849 bytes assets/static/images/people/orig/antonela.jpeg | Bin 0 -> 12110 bytes assets/static/images/people/orig/arlolra.jpg | Bin 0 -> 72136 bytes assets/static/images/people/orig/arma.jpg | Bin 0 -> 74271 bytes .../static/images/people/orig/arthuredelstein.jpg | Bin 0 -> 18449 bytes assets/static/images/people/orig/atagar.png | Bin 0 -> 116545 bytes assets/static/images/people/orig/bdavila.jpg | Bin 0 -> 1645382 bytes assets/static/images/people/orig/cindy.jpg | Bin 0 -> 210034 bytes assets/static/images/people/orig/dawuud.jpg | Bin 0 -> 9640 bytes assets/static/images/people/orig/dgoulet.png | Bin 0 -> 57781 bytes assets/static/images/people/orig/donnchac.jpg | Bin 0 -> 138279 bytes assets/static/images/people/orig/egypcio.jpg | Bin 0 -> 16276 bytes assets/static/images/people/orig/emmapeel.png | Bin 0 -> 150954 bytes assets/static/images/people/orig/ewyatt.jpg | Bin 0 -> 59903 bytes assets/static/images/people/orig/flexlibris.jpg | Bin 0 -> 615306 bytes assets/static/images/people/orig/gaba.jpg | Bin 0 -> 78748 bytes assets/static/images/people/orig/gunner.jpg | Bin 0 -> 722367 bytes assets/static/images/people/orig/haxxpop.jpg | Bin 0 -> 61834 bytes assets/static/images/people/orig/hc.jpg | Bin 0 -> 149652 bytes assets/static/images/people/orig/hellais.jpg | Bin 0 -> 47753 bytes assets/static/images/people/orig/hiro.jpg | Bin 0 -> 12804 bytes assets/static/images/people/orig/ian.jpg | Bin 0 -> 30787 bytes assets/static/images/people/orig/inf0.jpg | Bin 0 -> 21090 bytes assets/static/images/people/orig/isabela.jpg | Bin 0 -> 896719 bytes assets/static/images/people/orig/jselon.jpg | Bin 0 -> 33180 bytes assets/static/images/people/orig/juga.png | Bin 0 -> 97645 bytes assets/static/images/people/orig/karsten.jpg | Bin 0 -> 90829 bytes assets/static/images/people/orig/komlo.jpg | Bin 0 -> 23451 bytes assets/static/images/people/orig/kushal.jpg | Bin 0 -> 20760 bytes assets/static/images/people/orig/ln5.jpg | Bin 0 -> 54715 bytes assets/static/images/people/orig/meejah.svg | 59 + assets/static/images/people/orig/micahflee.jpeg | Bin 0 -> 16552 bytes assets/static/images/people/orig/moritz.png | Bin 0 -> 731576 bytes assets/static/images/people/orig/n8fr8.jpg | Bin 0 -> 21843 bytes assets/static/images/people/orig/nickhopper.jpg | Bin 0 -> 20252 bytes assets/static/images/people/orig/nyinz.jpg | Bin 0 -> 113648 bytes assets/static/images/people/orig/ohmygodel.jpg | Bin 0 -> 25960 bytes assets/static/images/people/orig/pari.jpg | Bin 0 -> 215061 bytes assets/static/images/people/orig/pastly.jpeg | Bin 0 -> 21097 bytes assets/static/images/people/orig/pepijn.jpg | Bin 0 -> 1025994 bytes assets/static/images/people/orig/phoul.jpg | Bin 0 -> 14218 bytes assets/static/images/people/orig/pili.png | Bin 0 -> 29383 bytes assets/static/images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes assets/static/images/people/orig/robgjansen.jpg | Bin 0 -> 24939 bytes assets/static/images/people/orig/robt.png | Bin 0 -> 689358 bytes assets/static/images/people/orig/saint.jpg | Bin 0 -> 81825 bytes assets/static/images/people/orig/serene.jpg | Bin 0 -> 42790 bytes assets/static/images/people/orig/sjmurdoch.jpg | Bin 0 -> 115664 bytes assets/static/images/people/orig/ssteele.jpg | Bin 0 -> 18889 bytes assets/static/images/people/orig/stephw.jpeg | Bin 0 -> 370743 bytes assets/static/images/people/orig/syverson.jpg | Bin 0 -> 729689 bytes assets/static/images/people/orig/t0mmy.jpg | Bin 0 -> 50507 bytes assets/static/images/people/orig/tjr.jpg | Bin 0 -> 91681 bytes assets/static/images/people/orig/wseltzer.jpg | Bin 0 -> 6888 bytes assets/static/images/people/pari.png | Bin 0 -> 39097 bytes assets/static/images/people/pastly.png | Bin 0 -> 31880 bytes assets/static/images/people/pepijn.png | Bin 0 -> 31866 bytes assets/static/images/people/phoul.png | Bin 0 -> 5932 bytes assets/static/images/people/pili.png | Bin 0 -> 8840 bytes assets/static/images/people/ramy.png | Bin 0 -> 36799 bytes assets/static/images/people/redshiftzero.png | Bin 0 -> 45395 bytes assets/static/images/people/robgjansen.png | Bin 0 -> 33856 bytes assets/static/images/people/robt.png | Bin 0 -> 35268 bytes assets/static/images/people/saint.png | Bin 0 -> 36642 bytes assets/static/images/people/sajolida.png | Bin 0 -> 7493 bytes assets/static/images/people/serene.png | Bin 0 -> 33567 bytes assets/static/images/people/sjmurdoch.png | Bin 0 -> 32427 bytes assets/static/images/people/ssteele.png | Bin 0 -> 42072 bytes assets/static/images/people/sstevenson.png | Bin 0 -> 39263 bytes assets/static/images/people/stephw.png | Bin 0 -> 35533 bytes assets/static/images/people/syverson.png | Bin 0 -> 14050 bytes assets/static/images/people/t0mmy.png | Bin 0 -> 25912 bytes assets/static/images/people/tjr.png | Bin 0 -> 26593 bytes assets/static/images/people/wayward.png | Bin 0 -> 4598 bytes assets/static/images/people/wseltzer.png | Bin 0 -> 38997 bytes assets/static/keys/agrabeli.txt | 66 + assets/static/keys/alsmith.txt | 50 + assets/static/keys/andreas.txt | 931 +++++ assets/static/keys/antonela.txt | 52 + assets/static/keys/biella.txt | 407 +++ assets/static/keys/dawuud.txt | 471 +++ assets/static/keys/donnchac.txt | 543 +++ assets/static/keys/egypcio.txt | 892 +++++ assets/static/keys/ewyatt.txt | 90 + assets/static/keys/gunner.txt | 44 + assets/static/keys/haxxpop.txt | 52 + assets/static/keys/ian.txt | 746 ++++ assets/static/keys/jselon.txt | 99 + assets/static/keys/julius.txt | 681 ++++ assets/static/keys/juris.txt | 321 ++ assets/static/keys/kat.txt | 109 + assets/static/keys/micahflee.txt | 2033 +++++++++++ assets/static/keys/moritz.txt | 3700 ++++++++++++++++++++ assets/static/keys/nyinz.txt | 57 + assets/static/keys/ohmygodel.txt | 37 + assets/static/keys/pari.txt | 52 + assets/static/keys/ramy.txt | 52 + assets/static/keys/redshiftzero.txt | 191 + assets/static/keys/robgjansen.txt | 1216 +++++++ assets/static/keys/robt.txt | 47 + assets/static/keys/sajolida.txt | 373 ++ assets/static/keys/ssteele.txt | 363 ++ assets/static/keys/stephw.txt | 247 ++ assets/static/keys/t0mmy.txt | 51 + content/about/people/agrabeli/contents.lr | 5 + content/about/people/ahf/contents.lr | 3 + content/about/people/ailanthus/contents.lr | 4 + content/about/people/alsmith/contents.lr | 4 + content/about/people/amoghbl1/contents.lr | 2 + content/about/people/andreas/contents.lr | 2 + content/about/people/antonela/contents.lr | 4 + content/about/people/arlolra/contents.lr | 4 + content/about/people/arma/contents.lr | 4 + content/about/people/arthuredelstein/contents.lr | 4 + content/about/people/asn/contents.lr | 4 + content/about/people/atagar/contents.lr | 4 + content/about/people/bdavila/contents.lr | 2 + content/about/people/biella-core/contents.lr | 4 + content/about/people/boklm/contents.lr | 2 + content/about/people/brade/contents.lr | 2 + content/about/people/catalyst/contents.lr | 2 + content/about/people/cindy-core/contents.lr | 4 + content/about/people/dawuud/contents.lr | 4 + content/about/people/dgoulet/contents.lr | 4 + content/about/people/donnchac/contents.lr | 4 + content/about/people/egypcio/contents.lr | 4 + content/about/people/emmapeel/contents.lr | 4 + content/about/people/ewyatt/contents.lr | 4 + content/about/people/flexlibris/contents.lr | 4 + content/about/people/gaba/contents.lr | 4 + content/about/people/geko/contents.lr | 2 + content/about/people/ggus/contents.lr | 2 + content/about/people/gunner/contents.lr | 4 + content/about/people/haxxpop/contents.lr | 4 + content/about/people/hc/contents.lr | 4 + content/about/people/hellais/contents.lr | 4 + content/about/people/hiro/contents.lr | 6 +- content/about/people/iangoldberg/contents.lr | 4 + content/about/people/igt0/contents.lr | 2 + content/about/people/inf0/contents.lr | 4 + content/about/people/intrigeri/contents.lr | 2 + content/about/people/irl/contents.lr | 4 + content/about/people/isabela/contents.lr | 4 + content/about/people/isra/contents.lr | 2 + content/about/people/jselon/contents.lr | 4 + content/about/people/juga/contents.lr | 4 + content/about/people/julius-core/contents.lr | 2 + content/about/people/juris/contents.lr | 2 + content/about/people/karsten/contents.lr | 4 + content/about/people/kat/contents.lr | 4 + content/about/people/komlo/contents.lr | 4 + content/about/people/kushal/contents.lr | 4 + content/about/people/ln5/contents.lr | 4 + content/about/people/mcs/contents.lr | 4 + content/about/people/meejah/contents.lr | 6 +- content/about/people/micahflee/contents.lr | 6 +- content/about/people/moritz/contents.lr | 6 + content/about/people/mrphs/contents.lr | 2 + content/about/people/mtigas/contents.lr | 6 +- content/about/people/n8fr8/contents.lr | 2 + content/about/people/nickm/contents.lr | 4 + content/about/people/ohmygodel/contents.lr | 4 + content/about/people/pari/contents.lr | 4 + content/about/people/pastly/contents.lr | 4 + content/about/people/pepijn/contents.lr | 4 + content/about/people/phoul/contents.lr | 4 + content/about/people/phw/contents.lr | 4 +- content/about/people/pili/contents.lr | 6 +- content/about/people/pospeselr/contents.lr | 2 + content/about/people/qbi/contents.lr | 2 + content/about/people/rabbi-rob-thomas/contents.lr | 4 + content/about/people/ramy-core/contents.lr | 4 + content/about/people/redshiftzero/contents.lr | 4 + content/about/people/robgjansen/contents.lr | 4 + content/about/people/saint/contents.lr | 4 + content/about/people/sajolida/contents.lr | 4 + content/about/people/sebastian/contents.lr | 2 + content/about/people/sjmurdoch/contents.lr | 2 + content/about/people/ssteele-core/contents.lr | 4 + content/about/people/sstevenson/contents.lr | 2 + content/about/people/stephw/contents.lr | 4 + content/about/people/sukhe/contents.lr | 2 + content/about/people/sysrqb/contents.lr | 4 +- content/about/people/syverson/contents.lr | 2 + content/about/people/t0mmy/contents.lr | 13 - content/about/people/teor/contents.lr | 2 + content/about/people/tjr/contents.lr | 4 + content/about/people/wayward/contents.lr | 2 + content/about/people/{peter => weasel}/contents.lr | 0 content/about/people/wseltzer/contents.lr | 4 + models/people.ini | 2 +- models/person.ini | 4 + templates/about.html | 2 +- templates/macros/people.html | 35 +- 248 files changed, 14378 insertions(+), 33 deletions(-)