commit 14c28f96689378ffe3bf60e1d88ecec398670751 Merge: 67485645 30e2ae48 Author: gus gus@torproject.org Date: Fri Apr 10 21:03:54 2020 -0400

Merge remote-tracking branch 'dip/core-contributors-update'

assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/keys/dawuud.txt | 471 ----------------------------- assets/static/keys/jnewsome.txt | 52 ++++ assets/static/keys/juris.txt | 321 -------------------- assets/static/keys/nyinz.txt | 57 ---- assets/static/keys/t0mmy.txt | 51 ---- content/about/people/ailanthus/contents.lr | 19 -- content/about/people/dawuud/contents.lr | 20 -- content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 21 ++ content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/narrira/contents.lr | 17 ++ content/about/people/pepijn/contents.lr | 19 -- content/about/people/wayward/contents.lr | 19 -- 20 files changed, 94 insertions(+), 1022 deletions(-)