Merge pull request #10064 from stangri/19.07-simple-adblock
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 25 Sep 2019 16:13:00 +0000 (19:13 +0300)
committerGitHub <noreply@github.com>
Wed, 25 Sep 2019 16:13:00 +0000 (19:13 +0300)
commit83e7e3af8d6a7e4f9a94f6255344fe7abae4cf5b
treea80d815244016b682b7c373369d21d964bafb7a9
parent55c61215368575a6a9805c012bbc73603e7b2c34
parent17a58fa39dde6ab51568ae85b0a43cbe773cb9e2
Merge pull request #10064 from stangri/19.07-simple-adblock

[19.07] simple-adblock: dnsmasq.ipset option support, better handling of IDNs, updated README