[tor-commits] [community/develop] Merge remote-tracking branch 'origin/master' into develop

[pili at torproject.org]

commit 53640c0c623268ce7374838375521acfe27952e1
Merge: 084aa98 110c22f
Author: Pili Guerra <pili at piliguerra.com>
Date:   Mon Nov 18 14:40:24 2019 +0100

    Merge remote-tracking branch 'origin/master' into develop

 assets/static/images/home/png/block-trackers.png   |  Bin 0 -> 18192 bytes
 .../static/images/home/png/block-trackers at 2x.png   |  Bin 0 -> 42047 bytes
 .../static/images/home/png/block-trackers at 3x.png   |  Bin 0 -> 66496 bytes
 assets/static/images/home/png/browse-freely.png    |  Bin 0 -> 27282 bytes
 assets/static/images/home/png/browse-freely at 2x.png |  Bin 0 -> 62800 bytes
 assets/static/images/home/png/browse-freely at 3x.png |  Bin 0 -> 99137 bytes
 assets/static/images/home/png/encryption.png       |  Bin 0 -> 19727 bytes
 assets/static/images/home/png/encryption at 2x.png    |  Bin 0 -> 44050 bytes
 assets/static/images/home/png/encryption at 3x.png    |  Bin 0 -> 70895 bytes
 assets/static/images/home/png/fingerprinting.png   |  Bin 0 -> 28619 bytes
 .../static/images/home/png/fingerprinting at 2x.png   |  Bin 0 -> 64240 bytes
 .../static/images/home/png/fingerprinting at 3x.png   |  Bin 0 -> 100068 bytes
 assets/static/images/home/png/surveillance.png     |  Bin 0 -> 18021 bytes
 assets/static/images/home/png/surveillance at 2x.png  |  Bin 0 -> 40297 bytes
 assets/static/images/home/png/surveillance at 3x.png  |  Bin 0 -> 63810 bytes
 assets/static/images/home/png/take-back at 3x.png     |  Bin 0 -> 124543 bytes
 assets/static/images/home/svg/block-trackers.svg   |    1 +
 assets/static/images/home/svg/browse-freely.svg    |    1 +
 assets/static/images/home/svg/encryption.svg       |    1 +
 assets/static/images/home/svg/fingerprinting.svg   |    1 +
 assets/static/images/home/svg/surveillance.svg     |    1 +
 assets/static/images/home/svg/take-back.svg        | 7902 ++++++++++++++++++++
 content/localization/contents.lr                   |    4 +-
 .../localization/translation-problem/contents.lr   |    2 +-
 content/onion-services/contents.lr                 |    2 +-
 content/onion-services/overview/contents.lr        |   33 +-
 content/onion-services/setup/contents.lr           |   14 +-
 content/relay-operations/contents.lr               |    2 +-
 .../technical-setup/bridge/docker/contents.lr      |   50 +-
 .../bridge/dragonflybsd/contents.lr                |  145 +
 .../technical-setup/bridge/netbsd/contents.lr      |  100 +
 .../relay-operations/technical-setup/contents.lr   |    2 +-
 .../technical-setup/exit/contents.lr               |   36 +-
 content/training/checklist/contents.lr             |   20 +-
 content/training/faq/contents.lr                   |   16 +-
 content/training/risks/contents.lr                 |   28 +-
 content/user-research/become-tester/contents.lr    |   15 +-
 content/user-research/contents.lr                  |   11 +-
 content/user-research/guidelines/contents.lr       |   76 +
 content/user-research/open/contents.lr             |   47 +-
 content/user-research/persona/contents.lr          |   27 +
 databags/menu+bn-BD.ini                            |    1 -
 databags/menu+de.ini                               |    1 -
 databags/menu+en.ini                               |    1 -
 databags/menu+es.ini                               |    1 -
 databags/menu+fr.ini                               |    1 -
 databags/menu+id.ini                               |    1 -
 databags/menu+is.ini                               |    1 -
 databags/menu+it.ini                               |    1 -
 databags/menu+ka.ini                               |    1 -
 databags/menu+ko.ini                               |    1 -
 databags/menu+pt-BR.ini                            |    1 -
 databags/menu+ru.ini                               |    1 -
 databags/menu+tr.ini                               |    1 -
 databags/menu+zh-CN.ini                            |    1 -
 databags/menu.ini                                  |    1 +
 databags/menu_footer+bn-BD.ini                     |    1 -
 databags/menu_footer+de.ini                        |    1 -
 databags/menu_footer+en.ini                        |    1 -
 databags/menu_footer+es.ini                        |    1 -
 databags/menu_footer+fr.ini                        |    1 -
 databags/menu_footer+id.ini                        |    1 -
 databags/menu_footer+is.ini                        |    1 -
 databags/menu_footer+it.ini                        |    1 -
 databags/menu_footer+ka.ini                        |    1 -
 databags/menu_footer+ko.ini                        |    1 -
 databags/menu_footer+pt-BR.ini                     |    1 -
 databags/menu_footer+ru.ini                        |    1 -
 databags/menu_footer+tr.ini                        |    1 -
 databags/menu_footer+zh-CN.ini                     |    1 -
 databags/menu_footer.ini                           |    1 +
 databags/pagenav+de.ini                            |    1 -
 databags/pagenav+es.ini                            |    1 -
 databags/pagenav+fr.ini                            |    1 -
 databags/pagenav+it.ini                            |    1 -
 databags/pagenav+pt-BR.ini                         |    1 -
 databags/pagenav+ru.ini                            |    1 -
 databags/{pagenav+en.ini => pagenav.ini}           |    0
 lego                                               |    2 +-
 templates/banner.html                              |    1 +
 templates/pagenav.html                             |    4 +-
 templates/resources.html                           |    7 +-
 templates/user-research.html                       |    8 +-
 83 files changed, 8428 insertions(+), 167 deletions(-)