[tor-commits] [tpo/master] Merge branch 'master' into master

[hiro@xxxxxxxxxxxxxx]

commit e54786e39077a7901f4587854316a690b7feb7f1
Merge: 3a52e28 780e6eb
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Thu Feb 7 16:11:44 2019 +0200

    Merge branch 'master' into master

 .../about/jobs/backend-engineer-ooni/contents.lr   |  5 ++
 content/about/jobs/browser-developer/contents.lr   |  6 +++
 .../press/boing-boing-charitable-guide/contents.lr | 18 +++++++
 content/press/contents.lr                          |  2 +
 content/press/new-release-tails/contents.lr        | 18 +++++++
 content/press/new-release-tor-browser/contents.lr  | 18 +++++++
 content/press/new-release-tor/contents.lr          | 16 ++++++
 .../tor-pulls-in-record-donations/contents.lr      | 18 +++++++
 content/press/wired-tor-easier/contents.lr         | 18 +++++++
 content/press/wired-tor-safer-sex/contents.lr      | 18 +++++++
 databags/download-alternatives.ini                 | 11 ++++
 models/post.ini                                    | 59 ++++++++++++++++++++++
 models/press.ini                                   | 33 ++++++++++++
 templates/download-languages.html                  |  2 +-
 templates/download-options.html                    |  2 +-
 templates/macros/downloads.html                    |  4 +-
 templates/macros/jobs.html                         |  5 +-
 templates/macros/press.html                        | 19 +++++++
 templates/post.html                                |  1 +
 templates/press.html                               | 52 ++++---------------
 20 files changed, 277 insertions(+), 48 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits