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

[boklm at torproject.org]

commit ad8e63b801003d4504b24a852c168ee98abcb815
Merge: 3f2a2cc9 bdf9077e
Author: hiromipaw <hiro at torproject.org>
Date:   Mon Jul 10 19:31:27 2017 +0200

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

 about/en/corepeople_alternate.wml |   43 +-
 images/people/hiro.png            |  Bin 0 -> 14842 bytes
 images/people/orig/hiro.jpg       |  Bin 0 -> 12804 bytes
 keys/asn.txt                      |  175 ++++
 keys/hiro.txt                     | 1903 +++++++++++++++++++++++++++++++++++++
 5 files changed, 2109 insertions(+), 12 deletions(-)