commit 4ba8a9e6c95ea5e93d6eb0c42cff18699d560f65 Merge: 5631c01 ac54958 Author: emma peel emma.peel@riseup.net Date: Wed Nov 6 11:04:30 2019 +0100

Merge branch 'master' into staging

.htaccess | 6 +- assets/static/images/home/png/take-back@3x.png | Bin 0 -> 124543 bytes assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++ content/about/history/contents.lr | 4 +- .../about/jobs/backend-engineer-ooni/contents.lr | 2 + content/about/jobs/browser-developer/contents.lr | 2 + .../jobs/developer-data-architect/contents.lr | 2 + .../jobs/senior-system-administrator/contents.lr | 2 + .../jobs/shadow-simulation-developer/contents.lr | 2 + .../torbrowser/RecommendedTBBVersions/contents.lr | 28 +- databags/download-alternatives.ini | 8 + databags/versions.ini | 10 +- lego | 2 +- models/job.ini | 4 + templates/about.html | 4 - templates/banner.html | 1 + templates/bottom_banner.html | 1 - templates/download-android.html | 10 +- templates/download-languages.html | 6 +- templates/download-options.html | 10 +- templates/download-tor.html | 10 +- templates/homepage.html | 9 +- templates/layout.html | 8 +- templates/meta.html | 7 +- 24 files changed, 7979 insertions(+), 61 deletions(-)