commit c8155f8ebc2252b874270634ed7ecdc99aa9f8d3 Merge: 667157a 5b7d63d Author: hiromipaw hiro@torproject.org Date: Wed Jan 11 17:17:19 2017 +0100

Merge branch 'master' into staging

about/en/corepeople.wml | 3 +++ 1 file changed, 3 insertions(+)