[tor-commits] [tpo/staging] update to last master

gus at torproject.org gus at torproject.org
Thu Aug 20 20:22:52 UTC 2020


commit a7a18c6f5b225c3ae828f844e76850d448fcb363
Merge: 01bc40fa 753988da
Author: emma peel <emma.peel at riseup.net>
Date:   Tue Oct 15 10:36:41 2019 +0200

    update to last master

 .github/FUNDING.yml                                |   3 +
 .htaccess                                          |   7 +-
 README.md                                          |  63 ++++++++++++++++
 assets/javascript                                  |   2 +-
 assets/scss                                        |   2 +-
 assets/static/css                                  |   2 +-
 assets/static/fonts                                |   2 +-
 assets/static/images/dcs-logo.png                  | Bin 0 -> 10135 bytes
 assets/static/images/favicon/favicon.ico           | Bin 0 -> 4286 bytes
 assets/static/images/favicon/favicon.png           | Bin 0 -> 1184 bytes
 assets/static/images/people/orig/wshackleton.png   | Bin 0 -> 239868 bytes
 assets/static/images/people/wshackleton.png        | Bin 0 -> 29922 bytes
 assets/static/js                                   |   2 +-
 assets/static/keys/sstevenson.txt                  |  79 +++++++++++++++++++++
 content/about/cy-pres/contents.lr                  |   4 +-
 content/about/people/ahf/contents.lr               |   2 +-
 content/about/people/anarcat/contents.lr           |  17 +++++
 content/about/people/arma/contents.lr              |   4 +-
 content/about/people/ggus/contents.lr              |   4 +-
 content/about/people/igt0/contents.lr              |  17 -----
 content/about/people/juga/contents.lr              |   2 +-
 content/about/people/meejah/contents.lr            |   2 +
 content/about/people/sajolida/contents.lr          |   2 +-
 content/about/people/schneier-core/contents.lr     |  15 ++++
 content/about/people/schneier/contents.lr          |  13 ++++
 content/about/people/sstevenson/contents.lr        |   4 ++
 content/about/people/wshackleton/contents.lr       |  20 ++++++
 .../about/reports/2009-data-collection/contents.lr |   2 +-
 .../about/reports/2010-irs-form-990/contents.lr    |   4 +-
 content/about/reports/2011-form-pc/contents.lr     |   2 +-
 .../reports/2012-financial-statements/contents.lr  |   2 +-
 content/about/reports/2012-form-pc/contents.lr     |   2 +-
 content/about/reports/2013-form-pc/contents.lr     |   2 +-
 .../2016-12-05-tor-project-bylaws/contents.lr      |   6 +-
 .../about/sponsors/DARPA-georgetown/contents.lr    |  17 +++++
 content/about/sponsors/nsf-georgetown/contents.lr  |   7 +-
 content/about/sponsors/nsf-minnesota/contents.lr   |   2 +-
 content/about/trademark/contents.lr                |  21 ++++++
 content/about/trademark/trademark-faq/contents.lr  |  15 ++++
 .../trademark-faq/trademark-faq-1/contents.lr      |  13 ++++
 .../trademark-faq/trademark-faq-2/contents.lr      |  12 ++++
 .../trademark-faq/trademark-faq-3/contents.lr      |  13 ++++
 .../trademark-faq/trademark-faq-4/contents.lr      |  16 +++++
 .../trademark-faq/trademark-faq-5/contents.lr      |  21 ++++++
 .../trademark-faq/trademark-faq-6/contents.lr      |  10 +++
 .../trademark-faq/trademark-faq-7/contents.lr      |  13 ++++
 content/download/alpha/contents.lr                 |   2 +-
 content/download/languages/contents.lr             |   2 +-
 .../contents.lr                                    |  19 +++++
 .../contents.lr                                    |  19 +++++
 .../contents.lr                                    |  19 +++++
 .../contents.lr                                    |  19 +++++
 .../contents.lr                                    |  19 +++++
 content/press/in-defense-of-anonymity/contents.lr  |  19 +++++
 .../contents.lr                                    |  19 +++++
 .../contents.lr                                    |  19 +++++
 .../mozilla-offers-research-grant/contents.lr      |  19 +++++
 content/press/new-release-tor-browser/contents.lr  |   2 +-
 .../contents.lr                                    |  19 +++++
 .../torbrowser/RecommendedTBBVersions/contents.lr  |  20 +++---
 databags/about+en.ini                              |   4 ++
 databags/menu+bn-BD.ini                            |  20 +-----
 databags/menu+de.ini                               |  20 +-----
 databags/menu+en.ini                               |  20 +-----
 databags/menu+es.ini                               |  20 +-----
 databags/menu+fr.ini                               |  20 +-----
 databags/menu+id.ini                               |  20 +-----
 databags/menu+is.ini                               |  20 +-----
 databags/menu+it.ini                               |  20 +-----
 databags/menu+ka.ini                               |  20 +-----
 databags/menu+ko.ini                               |  20 +-----
 databags/menu+pt-BR.ini                            |  20 +-----
 databags/menu+ru.ini                               |  20 +-----
 databags/menu+tr.ini                               |  20 +-----
 databags/menu_footer+ar.ini                        |   2 +-
 databags/menu_footer+de.ini                        |   2 +-
 databags/menu_footer+en.ini                        |  16 +----
 databags/menu_footer+es.ini                        |   2 +-
 databags/menu_footer+fr.ini                        |   2 +-
 databags/menu_footer+id.ini                        |   2 +-
 databags/menu_footer+is.ini                        |   2 +-
 databags/menu_footer+it.ini                        |   2 +-
 databags/menu_footer+ka.ini                        |   2 +-
 databags/menu_footer+ko.ini                        |   2 +-
 databags/menu_footer+pt-BR.ini                     |   2 +-
 databags/menu_footer+ru.ini                        |   2 +-
 databags/menu_footer+tr.ini                        |   2 +-
 databags/menu_footer+zh-CN.ini                     |   2 +-
 databags/versions.ini                              |  16 +++--
 lego                                               |   2 +-
 models/person.ini                                  |   5 ++
 models/question.ini                                |  20 ++++++
 models/topic.ini                                   |  23 ++++++
 models/trademark.ini                               |  34 +++++++++
 templates/about.html                               |   9 ++-
 templates/bottom_banner.html                       |   1 +
 templates/contact.html                             |  13 ++--
 templates/download-android.html                    |  31 ++++----
 templates/download-options.html                    |  37 ++++++++++
 templates/hero-download.html                       |  18 +++--
 templates/macros/contact.html                      |   2 +-
 templates/macros/downloads.html                    |  15 ++--
 templates/macros/footer.html                       |   2 +-
 templates/macros/people.html                       |   5 +-
 templates/macros/question.html                     |  22 ++++++
 templates/macros/topic.html                        |  18 +++++
 templates/meta.html                                |   7 +-
 templates/question.html                            |   6 ++
 templates/topic.html                               |   6 ++
 templates/trademark.html                           |   6 ++
 110 files changed, 886 insertions(+), 382 deletions(-)

diff --cc templates/download-android.html
index c299b45a,1f8fa2d2..5223003b
--- a/templates/download-android.html
+++ b/templates/download-android.html
@@@ -14,36 -14,25 +14,29 @@@
        <div class="row">
          <h3 class="mx-auto text-center text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3>
        </div>
 +    </div>
 +    <div class="d-none d-lg-block col-lg-4">
 +      <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding at 2x.png'|asseturl }}">
 +    </div>
 +  </div>
 +  <div class="row col-lg-10 mx-auto">
 +    <div class="col-lg-12 py-5 mt-5">
        <div class="row my-5">
-           <div class="col-md-6 col-sm-4 text-center p1">
-             <div class="row">
-               {% set t = bag('versions', 'torbrowser-alpha') %}
-               <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">arm</small></a>
-               <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>{{ _('sig') }}</small></a>
-               <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86</small></a>
-               <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('sig') }}</small></a>
-             </div>
-           </div>
-           <div class="col-md-3 col-sm-4 text-center p1">
-             <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">{{ _('Go to Google Play') }}</a>
-           </div>
+         <div class="col-xl-6 mx-auto text-center">
+           {% set t = bag('versions', 'torbrowser-stable-android') %}
+           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">arm</small></a>
+           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a>
+           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">x86</small></a>
+           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>sig</small></a>
+           <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }}  <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a>
+           <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>sig</small></a>
+           <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser">{{ _('Go to Google Play') }}</a>
            {% from "macros/downloads.html" import render_fdroid %}
-           <div class="col-md-3 col-sm-4 text-center p1">
-             <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>
-             <!--a class="btn btn-primary btn-sm nick mx-5 my-4" href="#"><small>sig</small></a-->
-           </div>
-       </div>
-       <div class="row">
-         <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a>
+           <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://support.torproject.org/tormobile/tormobile-7/">{{ _('Go to F-Droid') }}</a>
+           <!--a class="btn btn-primary btn-sm nick mx-5 my-4" href="#"><small>sig</small></a-->
+         </div>
        </div>
      </div>
 -    <div class="d-none d-lg-block col-lg-5 col-md-6">
 -      <img class="img-fluid p-5 m-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding at 2x.png'|asseturl }}">
 -    </div>
    </div>
    <div class="row pb-5">
        <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a>





More information about the tor-commits mailing list