Merge remote-tracking branch 'upstream/master' into cleanup-dns

This commit is contained in:
Mikaela Suomalainen
2019-11-04 13:52:50 +02:00
68 changed files with 457 additions and 456 deletions

View File

@ -68,16 +68,16 @@
</td>
<td>
<span class="no-text-wrap">
<span class="flag-icon flag-icon-ch"></span>
Switzerland,
</span>
<span class="no-text-wrap">
<span class="flag-icon flag-icon-jp"></span>
Japan,
<span class="flag-icon flag-icon-fi"></span>
Finland,
</span>
<span class="no-text-wrap">
<span class="flag-icon flag-icon-de"></span>
Germany
Germany,
</span>
<span class="no-text-wrap">
<span class="flag-icon flag-icon-jp"></span>
Japan
</span>
</td>
<td>
@ -104,7 +104,7 @@
</span>
<span class="no-text-wrap">
malicious domains
<span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard, IDN, and non-ASCII domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span>
<span class="badge badge-warning" data-toggle="tooltip" data-original-title="And some wildcard and IDN domains."><a href="https://github.com/ookangzheng/blahdns#default-blocked-wildcard-domain"><i class="fas fa-exclamation-triangle"></i></a></span>
</span>
</td>
<td>