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

[sebastian at torproject.org]

commit a41730e33ecc5424efae634c2d08956436dd00aa
Merge: 34e59f0 c8815b6
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sun Dec 14 00:39:08 2014 +0100

    Merge branch 'master' into staging

 about/en/jobs-projectmanager.wml |    4 +-
 about/en/jobs.wml                |   17 +-
 about/en/sidenav.wmi             |    4 +-
 docs/en/rpms.wml                 |    6 +-
 include/mirrors-table.wmi        |  496 ++++++++++++++------------------------
 include/tor-mirrors.csv          |  154 ++++++------
 6 files changed, 272 insertions(+), 409 deletions(-)