commit 73bd703a38f9cd99f698df25306db9c46721ebc1 Merge: 06be3b3 9f831c0 Author: Roger Dingledine arma@torproject.org Date: Wed Mar 9 14:21:55 2016 -0500

Merge branch 'master' into staging

.gitignore | 1 - .htaccess | 7 + Makefile | 2 +- about/en/contact.wml | 10 +- about/en/corepeople.wml | 19 +- about/en/financials.wml | 2 + about/en/gsoc.wml | 14 +- ...orProject-combined-Form990_PC_Audit_Results.pdf | Bin 0 -> 867206 bytes ...oject-combined-Form990_PC_Audit_Results.pdf.asc | 17 + css/layout.css | 35 +- docs/en/N900.wml | 191 ---- docs/en/debian.wml | 17 +- docs/en/faq.wml | 74 +- docs/en/rpms.wml | 2 + docs/en/sidenav.wmi | 6 - docs/en/tor-doc-relay.wml | 20 +- docs/en/tor-hidden-service.wml | 14 +- docs/en/verifying-signatures.wml | 41 +- docs/torbutton/en/sidenav.wmi | 6 - donate/en/donate-appelbaum.wml | 0 donate/en/donate-blog-alison.wml | 0 donate/en/donate-blog-ellsberg.wml | 0 donate/en/donate-blog-landau.wml | 0 donate/en/donate-blog-nanni.wml | 0 donate/en/donate-chaos.wml | 0 donate/en/donate-snowden.wml | 0 download/en/download-easy.wml | 29 +- download/en/download-unix.wml | 2 +- download/en/download.wml | 14 +- en/index.wml | 33 - getinvolved/en/volunteer.wml | 1204 +++++++++----------- images/N900/10_success-small.png | Bin 226409 -> 0 bytes images/N900/10_success.png | Bin 174213 -> 0 bytes images/N900/11_after_rebooting-small.png | Bin 52131 -> 0 bytes images/N900/11_after_rebooting.png | Bin 43976 -> 0 bytes images/N900/12_status_menu-small.png | Bin 122210 -> 0 bytes images/N900/12_status_menu.png | Bin 99049 -> 0 bytes images/N900/13_enable_tor-small.png | Bin 92249 -> 0 bytes images/N900/13_enable_tor.png | Bin 70965 -> 0 bytes images/N900/14_check_tor-small.png | Bin 76880 -> 0 bytes images/N900/14_check_tor.png | Bin 49637 -> 0 bytes images/N900/1_app_menu-small.png | Bin 262268 -> 0 bytes images/N900/1_app_menu.png | Bin 297204 -> 0 bytes images/N900/2_app_manager-small.png | Bin 187985 -> 0 bytes images/N900/2_app_manager.png | Bin 242688 -> 0 bytes images/N900/3_app_managermenu-small.png | Bin 144670 -> 0 bytes images/N900/3_app_managermenu.png | Bin 108576 -> 0 bytes images/N900/4_catalog_list-small.png | Bin 67683 -> 0 bytes images/N900/4_catalog_list.png | Bin 55933 -> 0 bytes images/N900/5_new_catalog-small.png | Bin 104907 -> 0 bytes images/N900/5_new_catalog.png | Bin 75177 -> 0 bytes images/N900/6_app_manager-small.png | Bin 187392 -> 0 bytes images/N900/6_app_manager.png | Bin 241880 -> 0 bytes images/N900/7_app_categories-small.png | Bin 137320 -> 0 bytes images/N900/7_app_categories.png | Bin 116193 -> 0 bytes images/N900/8_app_list-small.png | Bin 98294 -> 0 bytes images/N900/8_app_list.png | Bin 72474 -> 0 bytes images/N900/9_disclaimer-small.png | Bin 139479 -> 0 bytes images/N900/9_disclaimer.png | Bin 84438 -> 0 bytes images/homepage-banner-cd.jpg | Bin 84779 -> 0 bytes images/homepage-banner-lp.jpg | Bin 101171 -> 0 bytes images/homepage-banner-rd.jpg | Bin 86882 -> 0 bytes images/homepage-banner-rr.jpg | Bin 98192 -> 0 bytes images/homepage-banner-ss.jpg | Bin 92697 -> 0 bytes images/icon-TorMessenger.png | Bin 0 -> 2762 bytes include/foot.wmi | 1 - include/lang.wmi | 1 + include/mirrors-table.wmi | 159 +-- include/tor-mirrors.csv | 205 ++-- include/versions.wmi | 80 +- js/dlpage01.js | 6 +- js/jquery.client.min.js | 2 +- press/en/video.wml | 2 +- projects/en/projects.wml | 9 + projects/en/torbrowser.wml | 24 +- projects/en/tormessenger.wml | 4 + projects/torbrowser/RecommendedTBBVersions | 30 +- projects/torbrowser/design/index.html.en | 2 +- wml2po.sh | 2 +- 79 files changed, 1006 insertions(+), 1281 deletions(-)