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

[hiro at torproject.org]

commit c69eb984b93efb9779dd867787098b67f663852e
Merge: 1731e62d 3f17add4
Author: hiromipaw <hiro at torproject.org>
Date:   Mon Nov 27 20:41:21 2017 +0100

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

 about/en/contributors.wml           |   3 -
 about/en/corepeople.wml             | 152 ++++++++++++----------------
 css/people-table.css                |  40 ++++++++
 images/people/orig/redshiftzero.jpg | Bin 0 -> 51523 bytes
 images/people/redshiftzero.png      | Bin 0 -> 45395 bytes
 keys/redshiftzero.txt               | 191 ++++++++++++++++++++++++++++++++++++
 6 files changed, 292 insertions(+), 94 deletions(-)