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

[hiro at torproject.org]

commit 403a4f303e88c5d6f4a9827a2a8914c3cb4e800e
Merge: 397b8d7 a469854
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Nov 23 01:13:20 2016 +0100

    Merge branch 'master' into staging

 .htaccess | 54 ++++++------------------------------------------------
 1 file changed, 6 insertions(+), 48 deletions(-)