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

[sebastian at torproject.org]

commit 44d698fda36e28d74beea5fa6d1afb42a9904a79
Merge: 885532f 6b1c990
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Mon Nov 3 00:53:55 2014 +0100

    Merge branch 'master' into staging

 docs/en/verifying-signatures.wml           |    2 +-
 include/versions.wmi                       |   10 +++---
 projects/torbrowser/RecommendedTBBVersions |    6 +++-
 projects/torbrowser/design/index.html.en   |   53 +++++++++++++++++++++-------
 4 files changed, 52 insertions(+), 19 deletions(-)