commit d5eb3a4be8cbc762a38fdcd456959c8e4e54f3cb Merge: 497b708 42d36dc Author: Sebastian Hahn sebastian@torproject.org Date: Tue Nov 22 23:37:07 2016 +0100

Merge branch 'master' into staging

.htaccess | 7 +- css/layout.css | 159 ++++++++++++++++++++++++++++++++++++++++++ donate/en/donate-foot.wml | 0 donate/en/donate-options.wml | 2 +- download/en/download-easy.wml | 56 +-------------- download/en/download-unix.wml | 2 +- download/en/download.wml | 66 +----------------- en/index.wml | 32 +++++++++ images/onion-heart.png | Bin 0 -> 10592 bytes images/tor-roots-only.png | Bin 0 -> 119059 bytes include/foot.wmi | 2 +- include/navigation.wmi | 2 +- js/donation_banner.js | 36 ++++++++++ projects/en/torbrowser.wml | 2 +- 14 files changed, 239 insertions(+), 127 deletions(-)