[tor-commits] [community/staging] Merge because master was updated

[pili at torproject.org]

commit 9f4b5a58a61ffb30770714c54723703933f31351
Merge: d48c8c0 1f3016e
Author: emma peel <emma.peel at riseup.net>
Date:   Wed Jul 24 14:24:55 2019 +0200

    Merge because master was updated

 .../community-resources/good-bad-isps/contents.lr  | 257 ++++++++++-----------
 1 file changed, 122 insertions(+), 135 deletions(-)