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

[arma at torproject.org]

commit 393284333ba470f7b01ba0b2c7a050a98727897c
Merge: 836c6dcc 199c3a98
Author: hiromipaw <hiro at torproject.org>
Date:   Fri Jan 12 15:45:30 2018 +0100

    Merge branch 'master' of git-rw.torproject.org:project/web/webwml into tshirt-fix-num-ways

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