From: Charlie Fish <fishcharlie@me.com>
Date: Sun, 25 Jul 2021 03:07:35 +0000 (-0600)
Subject: Merge branch 'master' into issue423
X-Git-Tag: aggregated-20250518~432^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F424%2Fhead;p=thirdparty%2Fblocklistproject%2Flists.git

Merge branch 'master' into issue423

# Conflicts:
#	phishing.txt
---

d6ef03f814495dc0f137c6be114b62955dc471f6