commit 32fabd39ebd2a1716b55f33e37901aa009a359ca Merge: 172fab9 65c2448 Author: Sebastian Hahn sebastian@torproject.org Date: Tue Nov 17 14:33:16 2015 +0100

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

docs/en/rpms.wml | 6 +++--- download/en/download-easy.wml | 2 +- download/en/download.wml | 4 ++-- getinvolved/en/volunteer.wml | 2 +- include/versions.wmi | 22 +++++++++++----------- projects/en/torbrowser.wml | 28 ++++++++++++++++++++++++++-- projects/torbrowser/RecommendedTBBVersions | 18 ++++++++++-------- 7 files changed, 54 insertions(+), 28 deletions(-)