commit 3bf61005eb5acb94edfb805f849699c7b5bea4ec Merge: 183e81b 888f513 Author: Philipp Winter phw@nymity.ch Date: Fri Aug 30 15:50:27 2019 -0700

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

.../technical-considerations/contents.lr | 9 --- .../bridge/centos-rhel-opensuse/contents.lr | 14 +++-- .../bridge/debian-ubuntu/contents.lr | 2 + .../technical-setup/bridge/docker/contents.lr | 2 + .../technical-setup/bridge/freebsd/contents.lr | 6 +- .../bridge/getting-help/contents.lr | 2 + .../technical-setup/guard/centosrhel/contents.lr | 22 +++++-- .../guard/centosrhel/updates/contents.lr | 68 ++++++++++++++++++++++ .../technical-setup/guard/debianubuntu/contents.lr | 24 ++++++-- .../guard/debianubuntu/updates/contents.lr | 61 +++++++++++++++++++ .../technical-setup/guard/fedora/contents.lr | 24 ++++++-- .../guard/fedora/updates/contents.lr | 32 ++++++++++ .../technical-setup/guard/freebsd/contents.lr | 25 +++++--- .../guard/freebsd/updates/contents.lr | 45 ++++++++++++++ 14 files changed, 294 insertions(+), 42 deletions(-)