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

[arma at torproject.org]

commit 696948cc43ff0ac22c08cb535a867715dfa7e958
Merge: bd97432b 39328433
Author: hiromipaw <hiro at torproject.org>
Date:   Fri Jan 12 16:05:19 2018 +0100

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

 press/en/press.wml | 12 ++++++++++++
 1 file changed, 12 insertions(+)