[tor-commits] [webwml/staging] Merge branch 'master' of https://git.torproject.org/project/web/webwml

[sebastian at torproject.org]

commit 6925587e495a5579b47a37cc84f32cdbdbddb374
Merge: ffb3fb1 c8815b6
Author: Matt Pagan <matt at pagan.io>
Date:   Fri Dec 12 00:23:16 2014 -0600

    Merge branch 'master' of https://git.torproject.org/project/web/webwml

 about/en/jobs-projectcoordinator.wml |  118 +-------
 about/en/jobs-projectmanager.wml     |  120 ++++++++
 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 +++++------
 7 files changed, 392 insertions(+), 523 deletions(-)