[tor-commits] [tpo/master] Merge pull request #12 from torproject/master

hiro at torproject.org hiro at torproject.org
Wed Mar 27 17:32:37 UTC 2019


commit 7eb6c98dd98bbe9c21860e541241398706d4762d
Merge: 985626e 0b03e47
Author: Antonela <hola at antonela.me>
Date:   Wed Mar 27 09:10:02 2019 -0300

    Merge pull request #12 from torproject/master
    
    rebase

 .htaccess                                          |   43 +-
 assets/static/fonts/SourceSansPro/OFL.txt          |    2 +-
 assets/static/keys/moritz.txt                      | 4157 +++-----------------
 configs/i18n.ini                                   |    2 +-
 content/about/history/contents.lr                  |   18 +-
 .../about/jobs/backend-engineer-ooni/contents.lr   |    8 +-
 content/about/jobs/browser-developer/contents.lr   |    2 +-
 content/about/jobs/contents.lr                     |    2 +-
 .../jobs/developer-data-architect/contents.lr      |    8 +-
 .../jobs/senior-system-administrator/contents.lr   |    8 +-
 content/about/people/biella/contents.lr            |    2 +-
 content/about/people/boklm/contents.lr             |    2 +
 content/about/people/cindy/contents.lr             |    2 +-
 content/about/people/ewyatt/contents.lr            |    2 +
 content/about/people/ohmygodel/contents.lr         |    2 +-
 content/about/people/pospeselr/contents.lr         |    2 +
 content/about/people/sajolida/contents.lr          |    2 +
 content/about/people/ssteele/contents.lr           |    2 +-
 content/about/sponsors/DARPA-nrl/contents.lr       |    2 +-
 content/about/sponsors/DARPA-penn/contents.lr      |    2 +-
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |    2 +-
 content/about/sponsors/fastly/contents.lr          |    2 +-
 content/about/sponsors/imls-ny/contents.lr         |    2 +-
 content/about/sponsors/mozilla/contents.lr         |    4 +-
 content/about/sponsors/ncf/contents.lr             |    2 +-
 content/about/sponsors/nsf-rochester/contents.lr   |    2 +-
 content/about/sponsors/sida/contents.lr            |    2 +-
 .../15-great-free-privacy-downloads/contents.lr    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../blogging-where-speech-isn-t-free/contents.lr   |    2 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 content/press/contents.lr                          |    8 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../press/future-tense-the-deep-web/contents.lr    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../how-to-manage-your-web-footprint/contents.lr   |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 content/press/new-release-tails/contents.lr        |    2 -
 content/press/new-release-tor-browser/contents.lr  |    2 -
 content/press/new-release-tor/contents.lr          |    2 -
 .../nsa-targets-the-privacy-conscious/contents.lr  |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../the-fp-top-100-global-thinkers/contents.lr     |    5 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 content/press/tor-is-still-safe/contents.lr        |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    5 +-
 .../contents.lr                                    |    2 +-
 .../contents.lr                                    |    2 +-
 content/thank-you/contents.lr                      |    2 +-
 models/blog-post.ini                               |   29 -
 models/blog.ini                                    |   16 -
 models/post.ini                                    |    1 -
 models/press.ini                                   |    1 -
 templates/contact.html                             |    2 +-
 templates/download.html                            |    4 +-
 templates/home.html                                |    4 +-
 templates/jobs.html                                |    2 +-
 templates/people.html                              |    2 +-
 templates/projects.html                            |    2 +-
 99 files changed, 608 insertions(+), 3895 deletions(-)





More information about the tor-commits mailing list