[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

[boklm at torproject.org]

commit 2131b93aa996ca3bfed42f47f93cbd84473fbf70
Merge: f5b2e3f6 f673f594
Author: hiromipaw <hiro at torproject.org>
Date:   Fri Jul 14 16:19:29 2017 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/contributors.wml         |    6 +
 about/en/corepeople.wml           |    6 -
 about/en/corepeople_alternate.wml |  207 +-
 images/people/agrabeli.png        |  Bin 0 -> 29509 bytes
 images/people/arma.png            |  Bin 0 -> 34872 bytes
 images/people/bparker.png         |  Bin 0 -> 21887 bytes
 images/people/dawuud.png          |  Bin 0 -> 22257 bytes
 images/people/isabela.png         |  Bin 0 -> 14705 bytes
 images/people/ln5.png             |  Bin 0 -> 34926 bytes
 images/people/n8fr8.png           |  Bin 0 -> 32079 bytes
 images/people/nickm.png           |  Bin 0 -> 41516 bytes
 images/people/orig/agrabeli.jpg   |  Bin 0 -> 19745 bytes
 images/people/orig/arma.jpg       |  Bin 0 -> 74271 bytes
 images/people/orig/dawuud.jpg     |  Bin 0 -> 9640 bytes
 images/people/orig/isabela.jpg    |  Bin 0 -> 16817 bytes
 images/people/orig/kat5.jpg       |  Bin 1013588 -> 0 bytes
 images/people/orig/ln5.jpg        |  Bin 0 -> 18819 bytes
 images/people/orig/n8fr8.jpg      |  Bin 0 -> 21843 bytes
 images/people/orig/pepijn.jpg     |  Bin 0 -> 1025994 bytes
 images/people/orig/robt.png       |  Bin 0 -> 689358 bytes
 images/people/orig/serene.jpg     |  Bin 0 -> 42790 bytes
 images/people/orig/syverson.jpg   |  Bin 0 -> 729689 bytes
 images/people/pepijn.png          |  Bin 0 -> 31866 bytes
 images/people/robt.png            |  Bin 0 -> 35268 bytes
 images/people/roya.png            |  Bin 0 -> 36754 bytes
 images/people/serene.png          |  Bin 0 -> 33567 bytes
 images/people/syverson.png        |  Bin 0 -> 14050 bytes
 keys/agrabeli.txt                 |   66 +
 keys/ahf.txt                      |  172 -
 keys/ailanthus.txt                |  168 -
 keys/arlolra.txt                  | 1534 --------
 keys/arthuredelstein.txt          |   27 -
 keys/asn.txt                      |  175 -
 keys/atagar.txt                   |   56 -
 keys/bparker.txt                  |   63 +
 keys/dgoulet.txt                  | 2437 ------------
 keys/flexlibris.txt               |  771 ----
 keys/geko.txt                     |  833 ----
 keys/hellais.txt                  |   99 -
 keys/hiro.txt                     | 1903 ----------
 keys/karsten.txt                  | 1074 ------
 keys/linda.txt                    |  315 --
 keys/mcs.txt                      |   29 -
 keys/mrphs.txt                    |  352 --
 keys/nickm.txt                    |  606 ---
 keys/pastly.txt                   |   97 -
 keys/phoul.txt                    |  915 -----
 keys/qbi.txt                      | 7515 -------------------------------------
 keys/robt.txt                     |   47 +
 keys/saint.txt                    |  766 ----
 keys/sukhe.txt                    |  371 --
 keys/teor.txt                     | 1156 ------
 keys/tjr.txt                      |  507 ---
 keys/wseltzer.txt                 |  590 ---
 54 files changed, 353 insertions(+), 22510 deletions(-)