[tor-commits] [webwml/staging] Merge remote-tracking branch 'origin/master' into staging

[sebastian at torproject.org]

commit 9aabcefb9a0d61b82344d9c9cfe83a0c1bdb86f7
Merge: b8ac55e 55334cd
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri Sep 18 18:25:37 2015 +0200

    Merge remote-tracking branch 'origin/master' into staging

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