[tor-commits] [community/staging] Merge remote-tracking branch 'ggus/community-resources'

[hiro at torproject.org]

commit 742479de17aa723e0792911cb80745c8cd03915d
Merge: 7557129 02bc5b6
Author: emma peel <emma.peel at riseup.net>
Date:   Tue Sep 3 18:19:34 2019 +0200

    Merge remote-tracking branch 'ggus/community-resources'

 .../community-resources/contents.lr                |  2 +-
 .../eff-tor-legal-faq/contents.lr                  |  2 +-
 .../tor-dmca-response/contents.lr                  |  4 ++--
 .../community-resources/good-bad-isps/contents.lr  | 16 ++++++--------
 .../{swags => swag}/contents.lr                    |  6 +++---
 .../tor-abuse-templates/contents.lr                |  2 +-
 .../tor-exit-guidelines/contents.lr                | 12 +++++------
 .../tor-relay-universities/contents.lr             | 25 +++++++++-------------
 .../relays-requirements/contents.lr                |  6 +++---
 .../technical-considerations/contents.lr           |  2 +-
 .../relay-operations/types-of-relays/contents.lr   |  2 +-
 11 files changed, 35 insertions(+), 44 deletions(-)