[tor-commits] [community/staging] Merge branch 'master' into PROTechThor-log-faq-link
hiro at torproject.org
hiro at torproject.org
Sun Mar 21 19:17:28 UTC 2021
commit ef20e52d1f3600e6ab76681ef3fc21965333ea45
Merge: ef74067 3b7add0
Author: Enjeck Cleopatra <32180937+PROTechThor at users.noreply.github.com>
Date: Thu Dec 12 15:02:27 2019 +0100
Merge branch 'master' into PROTechThor-log-faq-link
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 ++++++++++++++++++++
.../becoming-tor-translator/contents.lr | 18 +-
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 | 12 +-
content/onion-services/ssl-tls/contents.lr | 21 -
.../community-resources/bad-relays/contents.lr | 26 +-
.../eff-tor-legal-faq/contents.lr | 4 +-
.../tor-dmca-response/contents.lr | 2 +
.../community-resources/good-bad-isps/contents.lr | 2 +
.../community-resources/swag/contents.lr | 6 +-
.../tor-abuse-templates/contents.lr | 2 +
.../tor-exit-guidelines/contents.lr | 4 +-
.../tor-relay-universities/contents.lr | 4 +-
content/relay-operations/contents.lr | 2 +-
.../bridge/debian-ubuntu/contents.lr | 15 +-
.../technical-setup/bridge/docker/contents.lr | 95 +-
.../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 | 13 +
content/user-research/contents.lr | 17 +-
content/user-research/current/contents.lr | 19 -
content/user-research/guidelines/contents.lr | 76 +
content/user-research/open/contents.lr | 47 +
content/user-research/persona/contents.lr | 27 +
content/user-research/signup/contents.lr | 19 -
content/user-testing/current/contents.lr | 19 -
content/user-testing/signup/contents.lr | 19 -
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} | 4 +
databags/training-resources.json | 11 +
lego | 2 +-
templates/banner.html | 1 +
templates/hero.html | 2 +-
templates/onion-services.html | 49 +-
templates/pagenav.html | 4 +-
templates/resources.html | 21 +-
templates/user-research.html | 34 +-
101 files changed, 8616 insertions(+), 312 deletions(-)
More information about the tor-commits
mailing list