commit 3e245c603dcec9a01570a4b57120ef8dcb891afb Merge: 6c4a70b 31e94ac Author: Sebastian Hahn sebastian@torproject.org Date: Sat Jun 18 15:57:23 2016 +0200

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

Makefile | 2 +- about/en/board.wml | 2 +- about/en/contact.wml | 92 ++++--- about/en/contributors.wml | 70 +++++ about/en/corepeople.wml | 258 +++++++++--------- about/en/jobs-ooni.wml | 151 +++++++++++ about/en/jobs.wml | 20 +- about/en/sidenav.wmi | 11 +- about/en/sponsors.wml | 15 +- about/en/translators.wml | 35 +-- about/en/volunteers.wml | 56 +--- docs/en/documentation.wml | 66 ++--- docs/en/faq-abuse.wml | 30 +-- docs/en/faq.wml | 246 +++-------------- docs/en/sidenav.wmi | 49 ++-- docs/en/signing-keys.wml | 137 +++------- docs/en/tor-doc-windows.wml | 50 +--- docs/en/tor-relay-debian.wml | 15 +- donate/en/donate-options.wml | 6 +- donate/en/donor-faq.wml | 10 +- download/en/download-easy.wml | 23 +- download/en/download.wml | 11 +- getinvolved/en/volunteer.wml | 420 +++++++++-------------------- images/fastly-logo.png | Bin 0 -> 3658 bytes include/mirrors-table.wmi | 227 ++++++++-------- include/tor-mirrors.csv | 208 +++++++------- include/versions.wmi | 48 ++-- press/en/info.wmi | 10 +- projects/en/projects.wml | 4 +- projects/en/tormessenger.wml | 4 - projects/torbrowser/RecommendedTBBVersions | 30 +-- 31 files changed, 963 insertions(+), 1343 deletions(-)