[tor-commits] [community/staging] Merge branch 'master' of git-rw.torproject.org:project/web/community into staging

[gus at torproject.org]

commit 4b278adda3238ecabc817c10bedeaca06a8086d3
Merge: 46c6d92 9831657
Author: gus <gus at torproject.org>
Date:   Thu Apr 15 15:32:25 2021 -0300

    Merge branch 'master' of git-rw.torproject.org:project/web/community into staging

 .htaccess                                          |  2 +-
 community.lektorproject                            |  8 +-
 configs/i18n.ini                                   |  2 +-
 .../community-resources/good-bad-isps/contents.lr  |  5 +-
 .../bridge/centos-rhel-opensuse/contents.lr        |  4 +-
 .../bridge/debian-ubuntu/contents.lr               |  2 +-
 .../technical-setup/bridge/docker/contents.lr      | 14 +++-
 .../bridge/dragonflybsd/contents.lr                |  2 +-
 .../technical-setup/bridge/fedora/contents.lr      |  2 +-
 .../technical-setup/bridge/freebsd/contents.lr     |  2 +-
 .../technical-setup/bridge/netbsd/contents.lr      |  2 +-
 .../technical-setup/bridge/openbsd/contents.lr     |  2 +-
 .../bridge/post-install/contents.lr                |  2 +-
 .../technical-setup/guard/fedora/contents.lr       | 25 +++---
 .../technical-setup/guard/windows/contents.lr      | 93 ++++++++++++++++++++++
 content/user-research/guidelines/contents.lr       | 30 +++++--
 content/user-research/how-to-volunteer/contents.lr | 70 ++++++++++++++++
 content/user-research/open/contents.lr             | 20 +----
 content/user-research/persona/contents.lr          | 11 +--
 content/user-research/reports/contents.lr          | 36 +++++++++
 databags/alternatives.ini                          |  6 +-
 models/page.ini                                    |  1 +
 models/text.ini                                    |  2 +
 templates/home.html                                |  8 +-
 templates/homepage.html                            |  9 ++-
 templates/layout.html                              |  3 +-
 templates/onion-services.html                      |  2 +-
 templates/outreach-talk.html                       |  2 +-
 templates/pagenav.html                             |  2 +-
 templates/relay-operations.html                    |  2 +-
 templates/two-columns-page.html                    |  2 +-
 31 files changed, 294 insertions(+), 79 deletions(-)