[tor-commits] [community/staging] Merge branch 'relays' into 'master'

[pili at torproject.org]

commit 6b6168afce194e4ff7f003e042671f9fca588890
Merge: b9ecab7 ab90ee0
Author: gus <gus at riseup.net>
Date:   Mon Jul 8 13:24:36 2019 -0700

    Merge branch 'relays' into 'master'
    
    Relay-operations: Include Good ISPs, Swag page and fix broken links
    
    See merge request gus/communitytpo!2

 .../community-resources/contents.lr                |  12 +-
 .../community-resources/good-bad-isps/contents.lr  | 324 +++++++++++++++++++--
 .../community-resources/swags/contents.lr          |  25 ++
 .../tor-abuse-templates/contents.lr                |   4 +-
 .../tor-exit-guidelines/contents.lr                |  34 +--
 .../tor-relay-universities/contents.lr             |   5 +-
 .../technical-setup/centosrhel/contents.lr         |  58 ----
 .../relay-operations/technical-setup/contents.lr   |  10 +-
 .../technical-setup/debianubuntu/contents.lr       |  44 ---
 .../technical-setup/fedora/contents.lr             |  37 ---
 .../technical-setup/freebsd/contents.lr            |  75 -----
 .../contents.lr                                    |  52 ++--
 12 files changed, 389 insertions(+), 291 deletions(-)