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

[sebastian at torproject.org]

commit 885532f16dbd7cc453ed629ea4e7dfa5ec4f3d9b
Merge: bc93fae afe5813
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Fri Oct 31 13:03:57 2014 +0100

    Merge branch 'master' into staging

 Makefile                                 |    2 +-
 include/mirrors-table.wmi                |  272 +++++++-----
 include/tor-mirrors.csv                  |  142 +++---
 include/versions.wmi                     |    2 +-
 projects/torbrowser/design/index.html.en |  701 +++++++++++++++++-------------
 5 files changed, 650 insertions(+), 469 deletions(-)