commit 41fdb8a7b32967655408b3858f2238436c5c7481 Merge: c73adcb5 3d72cf7f Author: hiromipaw hiro@torproject.org Date: Thu Oct 19 13:45:47 2017 +0200

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

about/en/corepeople.wml | 47 ++++++++++++++++++++++++++----------------- about/en/sponsors.wml | 4 ++-- images/people/ramy.png | Bin 0 -> 36799 bytes keys/ramy.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 20 deletions(-)