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

[sebastian at torproject.org]

commit 8e9bb0994de8e448fa23d1866a05f4e1c88959f3
Merge: f537f67 8db53bc
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Wed Nov 23 03:07:55 2016 +0100

    Merge branch 'master' into staging

 donate/en/donate-amazon.wml | 42 ++++++++++++++++++++++++++++++++++++++++++
 donate/en/sidenav.wmi       |  6 ------
 2 files changed, 42 insertions(+), 6 deletions(-)