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

[arma at torproject.org]

commit 918e13213df28933ff35212963e3f85eba514307
Merge: ecfeb321 ecb88869
Author: hiromipaw <hiro at torproject.org>
Date:   Tue Feb 6 11:09:17 2018 +0100

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

 about/en/contributors.wml        |   3 +
 about/en/corepeople.wml          | 145 ++++++++++++++++++---------------------
 docs/en/verifying-signatures.wml |   2 +-
 images/people/bparker.png        | Bin 21887 -> 0 bytes
 keys/bparker.txt                 |  63 -----------------
 projects/en/torbrowser.wml       |   7 +-
 6 files changed, 75 insertions(+), 145 deletions(-)