commit 45123e59b8c14283a70da516d97e2c97a79d8647 Merge: 69473b8b c66efabb Author: hiro hiro@torproject.org Date: Sun Sep 27 19:12:06 2020 +0200

Merge branch 'master' into staging

.htaccess | 241 +++++++++++++++++++++ .htaccess-membership | 4 - README.md | 5 +- assets/static/images/membership/logos/Avast.png | Bin 78009 -> 0 bytes .../static/images/membership/logos/MullvadVPN.png | Bin 21976 -> 0 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 ----------------- assets/static/images/membership/logos/avast.png | Bin 0 -> 25859 bytes assets/static/images/membership/logos/cymru.png | Bin 0 -> 32671 bytes assets/static/images/membership/logos/mullvad.png | Bin 0 -> 28521 bytes content/about/membership/contents.lr | 2 +- content/about/people/ahf/contents.lr | 4 +- content/about/people/biella/contents.lr | 2 - content/about/people/julius/contents.lr | 4 +- content/about/people/komlo-core/contents.lr | 19 ++ content/about/people/komlo/contents.lr | 12 +- content/about/people/matt/contents.lr | 2 - content/about/people/megan/contents.lr | 18 -- .../about/people/rabbi-rob-thomas-core/contents.lr | 17 ++ content/about/people/rabbi-rob-thomas/contents.lr | 10 +- content/about/people/ssteele/contents.lr | 17 -- .../torbrowser/RecommendedTBBVersions/contents.lr | 44 ++-- content/releases/tor-browser-10-0/contents.lr | 26 +++ databags/about.ini | 5 +- databags/download-alternatives-alpha.ini | 2 +- databags/download-alternatives.ini | 2 +- databags/versions.ini | 12 +- templates/hero-download.html | 2 +- templates/membership.html | 44 ++-- templates/privchat.html | 52 ++--- 29 files changed, 401 insertions(+), 342 deletions(-)

diff --cc templates/hero-download.html index acc7d869,df940e2b..4199e954 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@@ -52,5 -53,9 +52,5 @@@

<div class="row bg-darker my-5 p-3 rounded"> {% from "macros/downloads.html" import render_tor_browser_blog_post %} - <h5 class="mx-auto text-white text-center my-0"><i class="text-light fas fa-exclamation-circle text-warning px-2"></i>{{ _('Disabling Javascript: Please read the latest %s for more information.') |format(render_tor_browser_blog_post())| safe }}</h5> + <h5 class="mx-auto text-white text-center my-0"><i class="text-light fas fa-exclamation-circle text-warning px-2"></i>{{ _('Android Tor Browser 10 is under active development. Watch for its release in the coming weeks.') }}</h5> </div> - -<div class="hidden-sm row p-md-5 justify-content-center window-bg"> - <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> -</div>