diff -Nru libpsl-0.20.2/AUTHORS libpsl-0.21.0/AUTHORS
--- libpsl-0.20.2/AUTHORS	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/AUTHORS	2019-04-16 13:10:17.000000000 +0000
@@ -18,3 +18,7 @@
 Ryan Sleevi (Discussion, Requested DAFSA format and ICANN/PRIVATE support)
 Daurnimator (Code review, discussion, reports)
 Olle Liljenzin (Original DAFSA implementation and UTF-8 patch)
+Claudio Saveedra (Add support for PSL_TYPE_NO_STAR_RULE)
+Chun-wei Fan (Add NMake files)
+Xavier Claessens (Add Meson build system)
+Ignacio Casal Quinteiro (Improve Meson build)
diff -Nru libpsl-0.20.2/configure.ac libpsl-0.21.0/configure.ac
--- libpsl-0.20.2/configure.ac	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/configure.ac	2019-04-16 13:10:17.000000000 +0000
@@ -1,8 +1,8 @@
 
-AC_INIT([libpsl], [0.20.2], [tim.ruehsen@gmx.de], [libpsl], [https://github.com/rockdaboot/libpsl])
+AC_INIT([libpsl], [0.21.0], [tim.ruehsen@gmx.de], [libpsl], [https://github.com/rockdaboot/libpsl])
 AC_PREREQ([2.59])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([1.10 no-define foreign])
+AM_INIT_AUTOMAKE([1.10 no-define foreign dist-lzip])
 
 # Generate two configuration headers; one for building the library itself with
 # an autogenerated template, and a second one that will be installed alongside
@@ -104,7 +104,7 @@
     fi
   ], [ enable_asan=no ])
 
-# Define these substitions here to keep all version information in one place.
+# Define these substitutions here to keep all version information in one place.
 # For information on how to properly maintain the library version information,
 # refer to the libtool manual, section "Updating library version information":
 # https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -115,7 +115,7 @@
 # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
 # 5. If any interfaces have been added since the last public release, then increment age.
 # 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0. 
-AC_SUBST([LIBPSL_SO_VERSION], [8:1:3])
+AC_SUBST([LIBPSL_SO_VERSION], [8:2:3])
 AC_SUBST([LIBPSL_VERSION], $VERSION)
 
 # Check for enable/disable builtin PSL data
@@ -180,18 +180,17 @@
   # Check for libidn2
   PKG_CHECK_MODULES([LIBIDN2], [libidn2], [
     HAVE_LIBIDN2=yes
-    if test "$enable_runtime" = "libidn2"; then
+    if test "$enable_runtime" = "libidn2" -o "$enable_runtime" = "auto"; then
+      LIBS="$LIBIDN2_LIBS $LIBS"
       CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
     fi
   ], [
-    OLDLIBS=$LIBS
     AC_SEARCH_LIBS(idn2_lookup_u8, idn2, HAVE_LIBIDN2=yes,
     [
        if test "$enable_runtime" = "libidn2" -o "$enable_builtin" = "libidn2"; then
           AC_MSG_ERROR(You requested libidn2 but it is not installed.)
        fi
     ], -lunistring)
-    LIBS=$OLDLIBS
   ])
 
   if test "x$HAVE_LIBIDN2" = "xyes"; then
@@ -212,7 +211,8 @@
   # using AC_SEARCH_LIBS also don't work since functions have the library version appended
   PKG_CHECK_MODULES([LIBICU], [icu-uc], [
     HAVE_LIBICU=yes
-    if test "$enable_runtime" = "libicu"; then
+    if test "$enable_runtime" = "libicu" -o "$enable_runtime" = "auto"; then
+      LIBS="$LIBICU_LIBS $LIBS"
       CFLAGS="$LIBICU_CFLAGS $CFLAGS"
     fi
   ], [
@@ -228,8 +228,8 @@
         if test "$enable_runtime" = "libicu" -o "$enable_builtin" = "libicu"; then
           AC_MSG_ERROR(You requested libicu but it is not installed.)
         fi
+        LIBS=$OLDLIBS
       ])
-    LIBS=$OLDLIBS
   ])
 
   if test "x$HAVE_LIBICU" = "xyes"; then
@@ -248,18 +248,17 @@
   # Check for libidn
   PKG_CHECK_MODULES([LIBIDN], [libidn], [
     HAVE_LIBIDN=yes
-    if test "$enable_runtime" = "libidn"; then
+    if test "$enable_runtime" = "libidn" -o "$enable_runtime" = "auto"; then
+      LIBS="$LIBIDN_LIBS $LIBS"
       CFLAGS="$LIBIDN_CFLAGS $CFLAGS"
     fi
   ], [
-    OLDLIBS=$LIBS
     AC_SEARCH_LIBS(idna_to_ascii_8z, idn, HAVE_LIBIDN=yes,
     [
       if test "$enable_runtime" = "libidn" -o "$enable_builtin" = "libidn"; then
         AC_MSG_ERROR(You requested libidn but it is not installed.)
       fi
     ])
-    LIBS=$OLDLIBS
   ])
 
   if test "x$HAVE_LIBIDN" = "xyes"; then
@@ -284,9 +283,7 @@
 
 if test "x$HAVE_LIBIDN2" = "xyes" -o "x$HAVE_LIBIDN" = "xyes"; then
   # Check for libunistring, we need it for psl_str_to_utf8lower()
-  OLDLIBS=$LIBS
   AC_SEARCH_LIBS(u8_tolower, unistring, HAVE_UNISTRING=yes, AC_MSG_ERROR(You requested libidn2|libidn but libunistring is not installed.))
-  LIBS=$OLDLIBS
 fi
 
 # AM_ICONV sets @LIBICONV@ and @LTLIBICONV@ for use in Makefile.am
@@ -313,8 +310,18 @@
 elif test -n "$NEEDS_NSL" ; then
   LIBS="$LIBS -lnsl"
 else
-  # Needed for MinGW / Windows
-  AC_SEARCH_LIBS(inet_pton, ws2_32)
+  # Platform dependant options
+  case "${host_os}" in
+    # MinGW / Windows
+    *mingw*)
+      # Select Windows NT/2000 and later, for WSAStringToAddressW()
+      CPPFLAGS="$CPPFLAGS -D_WIN32_WINNT=0x500"
+      # Needed for network support
+      LIBS="$LIBS -lws2_32"
+      ;;
+    *)
+      ;;
+  esac
 fi
 
 # Check for clock_gettime() used for performance measurement
diff -Nru libpsl-0.20.2/contrib/check-hard-meson libpsl-0.21.0/contrib/check-hard-meson
--- libpsl-0.20.2/contrib/check-hard-meson	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/contrib/check-hard-meson	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Do some checking before 'git push'.
+
+# Set a stricter bash mode
+set -e
+set -u
+
+# We define _GNU_SOURCE to avoid warnings with missing prototypes.
+# C89 does not know snprintf, strdup, strndup, popen, pclose
+export CFLAGS="-std=gnu89 -pedantic -g -Wall -Wextra -Wstrict-prototypes -Wold-style-definition -Wwrite-strings -Wshadow -Wformat -Wformat-security -Wunreachable-code -Wstrict-prototypes -Wmissing-prototypes -Wold-style-definition"
+
+ASAN_FLAGS="-fsanitize=address -fno-omit-frame-pointer -fsanitize-address-use-after-scope"
+
+# measure time consumed and print it at the end of the script
+START=$(date +%s.%N)
+
+for CC in clang gcc; do
+  export CC
+  echo
+  echo "*** Testing with CC=$CC"
+
+  for options in \
+  "-Dbuiltin=libicu -Druntime=libicu" \
+  "-Dbuiltin=libidn2 -Druntime=libidn2" \
+  "-Dbuiltin=libidn -Druntime=libidn" \
+  "-Dbuiltin=no -Druntime=no"; do
+
+    # normal build+check+valgrind-check
+    echo
+    echo "  *** $options"
+    rm -rf builddir
+    meson builddir $options
+    cd builddir
+    ninja
+    for xLCALL in C tr_TR.utf8; do
+      LC_ALL=$xLCALL meson test
+      LC_ALL=$xLCALL meson test --wrap='valgrind --tool=memcheck'
+    done
+    cd ..
+
+    # UBSAN build+check
+    flags="-Db_sanitize=undefined -Db_lundef=false"
+    echo
+    echo "  *** $options $flags"
+    rm -rf builddir
+    LDFLAGS="-lubsan" meson builddir $options $flags
+    LDFLAGS="-lubsan" ninja -C builddir
+    for xLCALL in C tr_TR.utf8; do
+      LC_ALL=$xLCALL ninja test -C builddir
+    done
+
+    # ASAN build+check
+    flags="-Db_sanitize=address -Db_lundef=false"
+    echo
+    echo "  *** $options $flags"
+    rm -rf builddir
+    CFLAGS="$CFLAGS $ASAN_FLAGS" meson builddir $options $flags
+    CFLAGS="$CFLAGS $ASAN_FLAGS" ninja -C builddir
+    for xLCALL in C tr_TR.utf8; do
+      LC_ALL=$xLCALL CFLAGS="$CFLAGS $ASAN_FLAGS" ninja test -C builddir
+    done
+
+  done
+done
+
+END=$(date +%s.%N)
+echo
+echo "Duration: "$(echo "$END - $START" | bc)
diff -Nru libpsl-0.20.2/contrib/mingw libpsl-0.21.0/contrib/mingw
--- libpsl-0.20.2/contrib/mingw	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/contrib/mingw	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+set -e
+
+# just in case...
+unset CC
+unset CXX
+
+#PREFIX=i686-w64-mingw32
+PREFIX=x86_64-w64-mingw32
+
+#export PATH="/usr/$PREFIX/bin:$PATH"
+export INSTALLDIR="$PWD/$PREFIX"
+export PKG_CONFIG_PATH=$INSTALLDIR/lib/pkgconfig:/usr/$PREFIX/lib/pkgconfig
+export CPPFLAGS="-I$INSTALLDIR/include"
+export LDFLAGS="-L$INSTALLDIR/lib"
+
+# let mingw compiler be less verbose
+export CFLAGS="-O2 -Wall -Wno-format"
+
+# build libunistring
+if [ ! -d libunistring ]; then
+  git clone https://git.savannah.gnu.org/git/libunistring.git
+  cd libunistring
+else
+  cd libunistring
+  git pull
+fi
+./autogen.sh
+./configure --build=x86_64-pc-linux-gnu --host=$PREFIX --enable-shared --prefix=$INSTALLDIR
+make clean
+make -j$(nproc)
+make install
+cd ..
+
+# build libidn2
+if [ ! -d libidn2 ]; then
+  git clone https://gitlab.com/libidn/libidn2.git
+  cd libidn2
+else
+  cd libidn2
+  git pull
+fi
+./bootstrap
+./configure --build=x86_64-pc-linux-gnu --host=$PREFIX --enable-shared --disable-doc --disable-gcc-warnings --prefix=$INSTALLDIR
+make clean
+make -j$(nproc)
+make install
+cd ..
+
+# build libpsl
+export WINEPATH="$INSTALLDIR/bin;$INSTALLDIR/lib;/usr/$PREFIX/bin;/usr/$PREFIX/lib;$PWD/libpsl/.libs;$GCCLIB"
+./autogen.sh
+./configure --build=x86_64-pc-linux-gnu --host=$PREFIX --enable-shared --disable-gtk-doc --enable-runtime=libidn2 --enable-builtin=libidn2 --prefix=$INSTALLDIR
+make clean
+make -j$(nproc)
+make check -j$(nproc) LOG_COMPILER=wine
diff -Nru libpsl-0.20.2/contrib/spell-checker libpsl-0.21.0/contrib/spell-checker
--- libpsl-0.20.2/contrib/spell-checker	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/contrib/spell-checker	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+#
+# see https://github.com/codespell-project/codespell
+#
+# in short:
+#  - pip install codespell
+#  - add ~/.local/bin to PATH
+
+codespell $* -L "tim" `git ls-files|egrep -v '_fuzzer.in|_fuzzer.repro|^list$'`
diff -Nru libpsl-0.20.2/debian/changelog libpsl-0.21.0/debian/changelog
--- libpsl-0.20.2/debian/changelog	2018-10-15 19:11:19.000000000 +0000
+++ libpsl-0.21.0/debian/changelog	2020-03-31 16:33:53.000000000 +0000
@@ -1,3 +1,25 @@
+libpsl (0.21.0-1ubuntu1) focal; urgency=medium
+
+  * Make autopkgtests cross-arch-friendly: don't include a test dep on
+    diffutils, which is essential.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 31 Mar 2020 09:33:53 -0700
+
+libpsl (0.21.0-1) unstable; urgency=medium
+
+  * New upstream release
+  * standards-version: bump to 4.5.0 (no changes needed)
+  * wrap-and-sort -ast for d/tests/control
+  * move to dh 12
+  * import patches from upstream (closes: #945243)
+  * added Build-Depends line to libpsl5.symbols
+  * install manpages from upstream installation, not source
+  * deliberately avoid installing .la files
+  * dh_missing: use --fail-missing
+  * avoid lintian warnings about fuzzer inputs
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 04 Mar 2020 12:39:16 -0500
+
 libpsl (0.20.2-2) unstable; urgency=medium
 
   * correct dependencies for autopkgtest
diff -Nru libpsl-0.20.2/debian/compat libpsl-0.21.0/debian/compat
--- libpsl-0.20.2/debian/compat	2018-05-31 14:33:02.000000000 +0000
+++ libpsl-0.21.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru libpsl-0.20.2/debian/control libpsl-0.21.0/debian/control
--- libpsl-0.20.2/debian/control	2018-10-15 19:11:15.000000000 +0000
+++ libpsl-0.21.0/debian/control	2020-03-31 16:33:51.000000000 +0000
@@ -1,10 +1,11 @@
 Source: libpsl
 Priority: optional
-Maintainer: Tim Rühsen <tim.ruehsen@gmx.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Tim Rühsen <tim.ruehsen@gmx.de>
 Uploaders:
  Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
 Build-Depends:
- debhelper (>= 11~),
+ debhelper-compat (= 12),
 Build-Depends-Arch:
  autoconf-archive,
  automake,
@@ -14,7 +15,7 @@
  pkg-config,
  publicsuffix (>= 20150507),
  python3:any,
-Standards-Version: 4.2.1
+Standards-Version: 4.5.0
 Section: libs
 Homepage: https://github.com/rockdaboot/libpsl
 Vcs-Git: https://salsa.debian.org/debian/libpsl.git
diff -Nru libpsl-0.20.2/debian/libpsl5.symbols libpsl-0.21.0/debian/libpsl5.symbols
--- libpsl-0.20.2/debian/libpsl5.symbols	2018-05-31 14:33:02.000000000 +0000
+++ libpsl-0.21.0/debian/libpsl5.symbols	2020-03-04 17:39:16.000000000 +0000
@@ -1,4 +1,5 @@
 libpsl.so.5 libpsl5 #MINVER#
+* Build-Depends-Package: libpsl-dev
  psl_builtin@Base 0.13.0
  psl_builtin_file_time@Base 0.13.0
  psl_builtin_filename@Base 0.13.0
diff -Nru libpsl-0.20.2/debian/libpsl-dev.manpages libpsl-0.21.0/debian/libpsl-dev.manpages
--- libpsl-0.20.2/debian/libpsl-dev.manpages	2018-05-31 14:33:02.000000000 +0000
+++ libpsl-0.21.0/debian/libpsl-dev.manpages	2020-03-04 17:39:16.000000000 +0000
@@ -1 +1 @@
-docs/libpsl/libpsl.3
+usr/share/man/man3/libpsl.3
diff -Nru libpsl-0.20.2/debian/not-installed libpsl-0.21.0/debian/not-installed
--- libpsl-0.20.2/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/not-installed	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libpsl.la
diff -Nru libpsl-0.20.2/debian/patches/0002-make-psl-make-dafsa-py3-based.patch libpsl-0.21.0/debian/patches/0002-make-psl-make-dafsa-py3-based.patch
--- libpsl-0.20.2/debian/patches/0002-make-psl-make-dafsa-py3-based.patch	2018-05-31 15:00:31.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0002-make-psl-make-dafsa-py3-based.patch	2020-03-04 17:39:16.000000000 +0000
@@ -8,7 +8,7 @@
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9d41051..2795610 100644
+index cd504b3..9bd3631 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -69,8 +69,8 @@ AC_ARG_ENABLE([man],
@@ -23,7 +23,7 @@
  PKG_PROG_PKG_CONFIG
  
 diff --git a/src/psl-make-dafsa b/src/psl-make-dafsa
-index 8f5bb76..7ad4733 100755
+index 2bfd879..13afac9 100755
 --- a/src/psl-make-dafsa
 +++ b/src/psl-make-dafsa
 @@ -1,4 +1,4 @@
diff -Nru libpsl-0.20.2/debian/patches/0003-Fix-build-when-configured-with-with-psl-file.patch libpsl-0.21.0/debian/patches/0003-Fix-build-when-configured-with-with-psl-file.patch
--- libpsl-0.20.2/debian/patches/0003-Fix-build-when-configured-with-with-psl-file.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0003-Fix-build-when-configured-with-with-psl-file.patch	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1,34 @@
+From: Po-Chuan Hsieh <sunpoet@sunpoet.net>
+Date: Wed, 17 Apr 2019 13:25:48 +0000
+Subject: Fix build when configured with --with-psl-file
+
+The error message is as follows:
+Making all in tests
+make: don't know how to make ../list/public_suffix_list.dat. Stop
+
+make: stopped in /usr/ports/works/usr/ports/dns/libpsl/work/libpsl-libpsl-0.21.0/tests
+*** Error code 1
+
+Stop.
+
+(cherry picked from commit 9347024221f4a9d63f9dcafcda13362a7c8d92fe)
+---
+ tests/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 8b29b61..b226631 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -33,9 +33,9 @@ TESTS = $(PSL_TESTS)
+ # dafsa.psl and dafsa_ascii.psl must be created before any test is executed
+ # check-local target works in parallel to the tests, so the test suite will likely fail
+ BUILT_SOURCES = psl.dafsa psl_ascii.dafsa
+-psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat
++psl.dafsa: $(PSL_FILE)
+ 	$(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa
+-psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat
++psl_ascii.dafsa: $(PSL_FILE)
+ 	$(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa
+ 
+ clean-local:
diff -Nru libpsl-0.20.2/debian/patches/0004-Add-PSL_API-to-libpsl-sections.txt.patch libpsl-0.21.0/debian/patches/0004-Add-PSL_API-to-libpsl-sections.txt.patch
--- libpsl-0.20.2/debian/patches/0004-Add-PSL_API-to-libpsl-sections.txt.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0004-Add-PSL_API-to-libpsl-sections.txt.patch	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Tim_R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sun, 26 May 2019 17:59:44 +0200
+Subject: Add PSL_API to libpsl-sections.txt
+
+(cherry picked from commit ef352f8923ada2ec766f8bfdefc86ffd8402af09)
+---
+ docs/libpsl/libpsl-sections.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/libpsl/libpsl-sections.txt b/docs/libpsl/libpsl-sections.txt
+index c858051..ba7cf06 100644
+--- a/docs/libpsl/libpsl-sections.txt
++++ b/docs/libpsl/libpsl-sections.txt
+@@ -1,6 +1,7 @@
+ <SECTION>
+ <FILE>libpsl</FILE>
+ <TITLE>Public Suffix List functions</TITLE>
++PSL_API
+ PSL_VERSION
+ PSL_VERSION_MAJOR
+ PSL_VERSION_MINOR
diff -Nru libpsl-0.20.2/debian/patches/0005-Add-missing-api-indeces-for-gtk-doc.patch libpsl-0.21.0/debian/patches/0005-Add-missing-api-indeces-for-gtk-doc.patch
--- libpsl-0.20.2/debian/patches/0005-Add-missing-api-indeces-for-gtk-doc.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0005-Add-missing-api-indeces-for-gtk-doc.patch	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1,49 @@
+From: =?utf-8?q?Tim_R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sun, 26 May 2019 18:00:29 +0200
+Subject: Add missing api-indeces for gtk-doc
+
+(cherry picked from commit 74ee95079da53ed451e0c6bfb2758251a4243cab)
+---
+ docs/libpsl/libpsl-docs.sgml | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/docs/libpsl/libpsl-docs.sgml b/docs/libpsl/libpsl-docs.sgml
+index 1eca9a2..335d241 100644
+--- a/docs/libpsl/libpsl-docs.sgml
++++ b/docs/libpsl/libpsl-docs.sgml
+@@ -34,6 +34,35 @@
+     <title>Index of deprecated API</title>
+     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+   </index>
++  <index role="0.1">
++    <title>Index of symbols included in 0.1</title>
++    <xi:include href="xml/api-index-0.1.xml"><xi:fallback/></xi:include>
++  </index>
++  <index role="0.2.5">
++    <title>New symbols included in 0.2.5</title>
++    <xi:include href="xml/api-index-0.2.5.xml"><xi:fallback/></xi:include>
++  </index>
++  <index role="0.4">
++    <title>New symbols included in 0.4</title>
++    <xi:include href="xml/api-index-0.4.xml"><xi:fallback/></xi:include>
++  </index>
++  <index role="0.10.0">
++    <title>New symbols included in 0.10.0</title>
++    <xi:include href="xml/api-index-0.10.0.xml"><xi:fallback/></xi:include>
++  </index>
++  <index role="0.11.0">
++    <title>Index of symbols included in 0.11.0</title>
++    <xi:include href="xml/api-index-0.11.0.xml"><xi:fallback/></xi:include>
++  </index>
++  <index role="0.16">
++    <title>Index of symbols included in 0.16</title>
++    <xi:include href="xml/api-index-0.16.xml"><xi:fallback/></xi:include>
++  </index>
++  <index role="0.19">
++    <title>Index of symbols included in 0.19</title>
++    <xi:include href="xml/api-index-0.19.xml"><xi:fallback/></xi:include>
++  </index>
++
+ 
+ <!--
+   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
diff -Nru libpsl-0.20.2/debian/patches/0006-Use-NULL-and-FILE-overall-in-gtk-docs.patch libpsl-0.21.0/debian/patches/0006-Use-NULL-and-FILE-overall-in-gtk-docs.patch
--- libpsl-0.20.2/debian/patches/0006-Use-NULL-and-FILE-overall-in-gtk-docs.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0006-Use-NULL-and-FILE-overall-in-gtk-docs.patch	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1,61 @@
+From: =?utf-8?q?Tim_R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Sun, 26 May 2019 18:01:50 +0200
+Subject: Use %NULL and %FILE overall in gtk-docs
+
+(cherry picked from commit 999f28cc15b3dd50dbb5ce33afad9fe340264ef8)
+---
+ src/psl.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/psl.c b/src/psl.c
+index 1bdba3b..6cfde85 100644
+--- a/src/psl.c
++++ b/src/psl.c
+@@ -1164,9 +1164,9 @@ psl_ctx_t *psl_load_file(const char *fname)
+ 
+ /**
+  * psl_load_fp:
+- * @fp: FILE pointer
++ * @fp: %FILE pointer
+  *
+- * This function loads the public suffixes from a FILE pointer.
++ * This function loads the public suffixes from a %FILE pointer.
+  * To free the allocated resources, call psl_free().
+  *
+  * The suffixes are expected to be UTF-8 encoded (lowercase + NFKC) if they are international.
+@@ -1352,7 +1352,7 @@ void psl_free(psl_ctx_t *psl)
+  * When using the builtin psl context, you can provide UTF-8 (lowercase + NFKC) or ASCII/ACE (punycode)
+  * representations of domains to functions like psl_is_public_suffix().
+  *
+- * Returns: Pointer to the built in PSL data or NULL if this data is not available.
++ * Returns: Pointer to the built in PSL data or %NULL if this data is not available.
+  *
+  * Since: 0.1
+  */
+@@ -1373,7 +1373,7 @@ const psl_ctx_t *psl_builtin(void)
+  * The number of exceptions within the Public Suffix List are not included.
+  *
+  * If the information is not available, the return value is -1 (since 0.19).
+- * This is the case with DAFSA blobs or if @psl is NULL.
++ * This is the case with DAFSA blobs or if @psl is %NULL.
+  *
+  * Returns: Number of public suffixes entries in PSL context or -1 if this information is not available.
+  *
+@@ -1396,7 +1396,7 @@ int psl_suffix_count(const psl_ctx_t *psl)
+  * This function returns number of public suffix exceptions maintained by @psl.
+  *
+  * If the information is not available, the return value is -1 (since 0.19).
+- * This is the case with DAFSA blobs or if @psl is NULL.
++ * This is the case with DAFSA blobs or if @psl is %NULL.
+  *
+  * Returns: Number of public suffix exceptions in PSL context or -1 if this information is not available.
+  *
+@@ -1419,7 +1419,7 @@ int psl_suffix_exception_count(const psl_ctx_t *psl)
+  * This function returns number of public suffix wildcards maintained by @psl.
+  *
+  * If the information is not available, the return value is -1 (since 0.19).
+- * This is the case with DAFSA blobs or if @psl is NULL.
++ * This is the case with DAFSA blobs or if @psl is %NULL.
+  *
+  * Returns: Number of public suffix wildcards in PSL context or -1 if this information is not available.
+  *
diff -Nru libpsl-0.20.2/debian/patches/0007-gtk-doc-do-not-include-tree_index.sgml.patch libpsl-0.21.0/debian/patches/0007-gtk-doc-do-not-include-tree_index.sgml.patch
--- libpsl-0.20.2/debian/patches/0007-gtk-doc-do-not-include-tree_index.sgml.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0007-gtk-doc-do-not-include-tree_index.sgml.patch	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1,26 @@
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Sat, 1 Jun 2019 13:09:41 +0200
+Subject: gtk-doc: do not include tree_index.sgml
+
+gtk-doc 1.30 no longer generates the file if the object tree is empty.
+
+(cherry picked from commit 87d1add318b5e5d09977f7f374e923577b6ff3be)
+---
+ docs/libpsl/libpsl-docs.sgml | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/docs/libpsl/libpsl-docs.sgml b/docs/libpsl/libpsl-docs.sgml
+index 335d241..88c7ba8 100644
+--- a/docs/libpsl/libpsl-docs.sgml
++++ b/docs/libpsl/libpsl-docs.sgml
+@@ -22,10 +22,6 @@
+         </para>
+         <xi:include href="xml/libpsl.xml"/>
+   </chapter>
+-  <chapter id="object-tree">
+-    <title>Object Hierarchy</title>
+-     <xi:include href="xml/tree_index.sgml"/>
+-  </chapter>
+   <index id="api-index-full">
+     <title>API Index</title>
+     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff -Nru libpsl-0.20.2/debian/patches/series libpsl-0.21.0/debian/patches/series
--- libpsl-0.20.2/debian/patches/series	2018-05-31 15:00:31.000000000 +0000
+++ libpsl-0.21.0/debian/patches/series	2020-03-04 17:39:16.000000000 +0000
@@ -1,2 +1,7 @@
 0001-remove-git-submodules.patch
 0002-make-psl-make-dafsa-py3-based.patch
+0003-Fix-build-when-configured-with-with-psl-file.patch
+0004-Add-PSL_API-to-libpsl-sections.txt.patch
+0005-Add-missing-api-indeces-for-gtk-doc.patch
+0006-Use-NULL-and-FILE-overall-in-gtk-docs.patch
+0007-gtk-doc-do-not-include-tree_index.sgml.patch
diff -Nru libpsl-0.20.2/debian/psl-make-dafsa.manpages libpsl-0.21.0/debian/psl-make-dafsa.manpages
--- libpsl-0.20.2/debian/psl-make-dafsa.manpages	2018-05-31 14:33:02.000000000 +0000
+++ libpsl-0.21.0/debian/psl-make-dafsa.manpages	2020-03-04 17:39:16.000000000 +0000
@@ -1 +1 @@
-src/psl-make-dafsa.1
+usr/share/man/man1/psl-make-dafsa.1
diff -Nru libpsl-0.20.2/debian/psl.manpages libpsl-0.21.0/debian/psl.manpages
--- libpsl-0.20.2/debian/psl.manpages	2018-05-31 14:33:02.000000000 +0000
+++ libpsl-0.21.0/debian/psl.manpages	2020-03-04 17:39:16.000000000 +0000
@@ -1 +1 @@
-tools/psl.1
+usr/share/man/man1/psl.1
diff -Nru libpsl-0.20.2/debian/rules libpsl-0.21.0/debian/rules
--- libpsl-0.20.2/debian/rules	2018-10-15 19:03:40.000000000 +0000
+++ libpsl-0.21.0/debian/rules	2020-03-04 17:39:16.000000000 +0000
@@ -33,3 +33,6 @@
 override_dh_clean:
 	[ -e missing ] || ln -sf /usr/share/libtool/build-aux/missing missing
 	dh_clean
+
+override_dh_missing:
+	dh_missing --fail-missing
diff -Nru libpsl-0.20.2/debian/source/lintian-overrides libpsl-0.21.0/debian/source/lintian-overrides
--- libpsl-0.20.2/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/source/lintian-overrides	2020-03-04 17:39:16.000000000 +0000
@@ -0,0 +1,4 @@
+# These are files generated by fuzzing the inputs to libpsl, and
+# are useful to catch errors in the test suite.
+# They are not actually pre-built windows binaries.
+libpsl source: source-contains-prebuilt-windows-binary fuzz/libpsl*_load_fuzzer.in/*
diff -Nru libpsl-0.20.2/debian/tests/control libpsl-0.21.0/debian/tests/control
--- libpsl-0.20.2/debian/tests/control	2018-10-15 19:11:11.000000000 +0000
+++ libpsl-0.21.0/debian/tests/control	2020-03-31 16:33:15.000000000 +0000
@@ -1,2 +1,4 @@
 Tests: psl-test
-Depends: diffutils, publicsuffix, psl
+Depends:
+ psl,
+ publicsuffix,
diff -Nru libpsl-0.20.2/fuzz/main.c libpsl-0.21.0/fuzz/main.c
--- libpsl-0.20.2/fuzz/main.c	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/fuzz/main.c	2019-04-16 13:10:17.000000000 +0000
@@ -22,7 +22,7 @@
  * This file is part of libpsl.
  */
 
-#include "../config.h"
+#include <config.h>
 
 #include <stdio.h>
 
@@ -41,6 +41,11 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#if defined (_MSC_VER) && ! defined (ssize_t)
+#include <basetsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include "fuzzer.h"
 
 #if defined (TEST_RUN) && defined (HAVE_FMEMOPEN)
@@ -57,31 +62,36 @@
 
 	if ((dirp = opendir(dirname))) {
 		while ((dp = readdir(dirp))) {
+			size_t fnamesize;
+			char *fname;
+			int fd;
+			struct stat st;
+			uint8_t *data;
+			ssize_t n;
+
 			if (*dp->d_name == '.') continue;
 
-			char fname[strlen(dirname) + strlen(dp->d_name) + 2];
-			snprintf(fname, sizeof(fname), "%s/%s", dirname, dp->d_name);
+			fnamesize = strlen(dirname) + strlen(dp->d_name) + 2;
+			fname = alloca(fnamesize);
+			snprintf(fname, fnamesize, "%s/%s", dirname, dp->d_name);
 
-			int fd;
 			if ((fd = open(fname, O_RDONLY)) == -1) {
 				fprintf(stderr, "Failed to open %s (%d)\n", fname, errno);
 				continue;
 			}
 
-			struct stat st;
 			if (fstat(fd, &st) != 0) {
 				fprintf(stderr, "Failed to stat %d (%d)\n", fd, errno);
 				close(fd);
 				continue;
 			}
 
-			uint8_t *data = malloc(st.st_size);
-			ssize_t n;
+			data = malloc(st.st_size);
 			if ((n = read(fd, data, st.st_size)) == st.st_size) {
-				printf("testing %llu bytes from '%s'\n", (unsigned long long) st.st_size, fname);
+				printf("testing %u bytes from '%s'\n", (int) st.st_size, fname);
 				LLVMFuzzerTestOneInput(data, st.st_size);
 			} else
-				fprintf(stderr, "Failed to read %llu bytes from %s (%d), got %zd\n", (unsigned long long) st.st_size, fname, errno, n);
+				fprintf(stderr, "Failed to read %d bytes from %s (%d), got %d\n", (int) st.st_size, fname, errno, (int) n);
 
 			free(data);
 			close(fd);
@@ -93,7 +103,8 @@
 int main(int argc, char **argv)
 {
 	const char *target;
-	char corporadir[sizeof(SRCDIR) + 1 + strlen(argv[0]) + 8];
+	size_t corporadirsize = sizeof(SRCDIR) + 1 + strlen(argv[0]) + 8;
+	char *corporadir = alloca(corporadirsize);
 
 	/* if VALGRIND testing is enabled, we have to call ourselves with valgrind checking */
 	if (argc == 1) {
@@ -111,11 +122,11 @@
 	target = strrchr(argv[0], '/');
 	target = target ? target + 1 : argv[0];
 
-	snprintf(corporadir, sizeof(corporadir), SRCDIR "/%s.in", target);
+	snprintf(corporadir, corporadirsize, SRCDIR "/%s.in", target);
 
 	test_all_from(corporadir);
 
-	snprintf(corporadir, sizeof(corporadir), SRCDIR "/%s.repro", target);
+	snprintf(corporadir, corporadirsize, SRCDIR "/%s.repro", target);
 
 	test_all_from(corporadir);
 
diff -Nru libpsl-0.20.2/fuzz/meson.build libpsl-0.21.0/fuzz/meson.build
--- libpsl-0.20.2/fuzz/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/fuzz/meson.build	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,24 @@
+fuzzer_cargs = [
+  '-DSRCDIR="@0@"'.format(meson.current_source_dir()),
+  '-DTEST_RUN',
+]
+
+foreach test_case : ['fuzzer', 'load_fuzzer', 'load_dafsa_fuzzer']
+  if enable_runtime == 'libidn2'
+    test_name = 'libpsl_idn2_' + test_case
+  elif enable_runtime == 'libicu'
+    test_name = 'libpsl_icu_' + test_case
+  elif enable_runtime == 'libidn'
+    test_name = 'libpsl_idn_' + test_case
+  else
+    test_name = 'libpsl_' + test_case
+  endif
+  source_file = 'libpsl_@0@.c'.format(test_case)
+  exe = executable(test_name, source_file, 'main.c',
+    link_with : libpsl,
+    c_args : fuzzer_cargs,
+    include_directories : [configinc, includedir],
+    dependencies : libicu_dep,
+  )
+  test(test_name, exe)
+endforeach
diff -Nru libpsl-0.20.2/.gitignore libpsl-0.21.0/.gitignore
--- libpsl-0.20.2/.gitignore	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/.gitignore	2019-04-16 13:10:17.000000000 +0000
@@ -79,7 +79,7 @@
 po/stamp-po
 src/psl2c
 src/suffixes.c
-src/suffixes_dafsa.c
+src/suffixes_dafsa.h
 stamp-h1
 test-driver
 tests/*.log
diff -Nru libpsl-0.20.2/include/libpsl.h.in libpsl-0.21.0/include/libpsl.h.in
--- libpsl-0.20.2/include/libpsl.h.in	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/include/libpsl.h.in	2019-04-16 13:10:17.000000000 +0000
@@ -40,12 +40,17 @@
 #define PSL_VERSION_PATCH @LIBPSL_VERSION_PATCH@
 #define PSL_VERSION_NUMBER @LIBPSL_VERSION_NUMBER@
 
+/* support clang's __has_declspec_attribute attribute */
+#ifndef __has_declspec_attribute
+#  define __has_declspec_attribute(x) 0
+#endif
+
 #ifndef PSL_API
 #if defined BUILDING_PSL && HAVE_VISIBILITY
 #  define PSL_API __attribute__ ((__visibility__("default")))
-#elif defined BUILDING_PSL && defined _MSC_VER && !defined PSL_STATIC
+#elif defined BUILDING_PSL && (defined _MSC_VER || __has_declspec_attribute(dllexport)) && !defined PSL_STATIC
 #  define PSL_API __declspec(dllexport)
-#elif defined _MSC_VER && !defined PSL_STATIC
+#elif (defined _MSC_VER || __has_declspec_attribute(dllimport)) && !defined PSL_STATIC
 #  define PSL_API __declspec(dllimport)
 #else
 #  define PSL_API
@@ -86,7 +91,7 @@
 	PSL_ERR_NO_MEM = -6    /* failed to allocate memory */
 } psl_error_t;
 
-typedef struct _psl_ctx_st psl_ctx_t;
+typedef struct psl_ctx_st psl_ctx_t;
 
 /* frees PSL context */
 PSL_API
diff -Nru libpsl-0.20.2/include/meson.build libpsl-0.21.0/include/meson.build
--- libpsl-0.20.2/include/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/include/meson.build	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,26 @@
+version = meson.project_version()
+version_arr = version.split('.')
+major = version_arr[0].to_int()
+minor = version_arr[1].to_int()
+patch = version_arr[2].to_int()
+
+cdata = configuration_data()
+cdata.set('LIBPSL_VERSION', version)
+cdata.set('LIBPSL_VERSION_MAJOR', major)
+cdata.set('LIBPSL_VERSION_MINOR', minor)
+cdata.set('LIBPSL_VERSION_PATCH', patch)
+
+hex = '0123456789abcdef'
+ver = '0x@0@@1@@2@@3@@4@@5@'
+cdata.set('LIBPSL_VERSION_NUMBER',
+  ver.format(
+    hex[major / 16], hex[major % 16],
+    hex[minor / 16], hex[minor % 16],
+    hex[patch / 16], hex[minor % 16]))
+
+libpsl_h = configure_file(
+  input : 'libpsl.h.in',
+  output : 'libpsl.h',
+  configuration : cdata)
+
+install_headers(libpsl_h)
diff -Nru libpsl-0.20.2/.lgtm.yml libpsl-0.21.0/.lgtm.yml
--- libpsl-0.20.2/.lgtm.yml	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/.lgtm.yml	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,7 @@
+extraction:
+  cpp:
+    prepare:
+      packages:
+        - lzip
+    configure:
+      command: ./autogen.sh && ./configure --disable-gtk-doc
diff -Nru libpsl-0.20.2/meson.build libpsl-0.21.0/meson.build
--- libpsl-0.20.2/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/meson.build	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,148 @@
+project('libpsl', 'c',
+  version : '0.20.2',
+  meson_version : '>=0.47.0')
+
+cc = meson.get_compiler('c')
+
+enable_runtime = get_option('runtime')
+enable_builtin = get_option('builtin')
+
+# We need to know the build type to determine what .lib files we need on Visual Studio
+# for dependencies that don't normally come with pkg-config files for Visual Studio builds
+buildtype = get_option('buildtype')
+
+notfound = dependency('', required : false)
+libidn2_dep = notfound
+libicu_dep = notfound
+libidn_dep = notfound
+libunistring = notfound
+networking_deps = notfound
+
+# FIXME: Cleanup this when Meson gets 'feature-combo':
+# https://github.com/mesonbuild/meson/issues/4566
+# Dependency fallbacks would help too:
+# https://github.com/mesonbuild/meson/pull/4595
+if ['libidn2', 'auto'].contains(enable_runtime) or ['libidn2', 'auto'].contains(enable_builtin)
+  libidn2_dep = dependency('libidn2', required : false)
+  if not libidn2_dep.found() and cc.has_header('idn2.h')
+    libidn2_dep = cc.find_library('idn2', required : false)
+  endif
+  if libidn2_dep.found()
+    if enable_runtime == 'auto'
+      enable_runtime = 'libidn2'
+    endif
+    if enable_builtin == 'auto'
+      enable_builtin = 'libidn2'
+    endif
+  elif [enable_runtime, enable_builtin].contains('libidn2')
+    error('You requested libidn2 but it is not installed.')
+  endif
+endif
+
+if ['libicu', 'auto'].contains(enable_runtime) or ['libicu', 'auto'].contains(enable_builtin)
+  libicu_dep = dependency('icu-uc', required : false)
+  if not libicu_dep.found() and cc.has_header('unicode/ustring.h')
+    # MSVC: the debug configuration of ICU generated the libraries with d suffix
+    # we must handle this and search for the right library depending on the
+    # build type. Note debugoptimized is just a release build with .pdb files enabled
+    if cc.get_id() == 'msvc' and buildtype == 'debug'
+      libicu_dep = cc.find_library('icuucd', required : false)
+    else
+      libicu_dep = cc.find_library('icuuc', required : false)
+    endif
+  endif
+  if libicu_dep.found()
+    if enable_runtime == 'auto'
+      enable_runtime = 'libicu'
+    endif
+    if enable_builtin == 'auto'
+      enable_builtin = 'libicu'
+    endif
+  elif [enable_runtime, enable_builtin].contains('libicu')
+    error('You requested libicu but it is not installed.')
+  endif
+endif
+
+if ['libidn', 'auto'].contains(enable_runtime) or ['libidn', 'auto'].contains(enable_builtin)
+  libidn_dep = dependency('libidn', required : false)
+  if not libidn_dep.found() and cc.has_header('idna.h')
+    libidn_dep = cc.find_library('idn', required : false)
+  endif
+  if libidn_dep.found()
+    if enable_runtime == 'auto'
+      enable_runtime = 'libidn'
+    endif
+    if enable_builtin == 'auto'
+      enable_builtin = 'libidn'
+    endif
+  elif [enable_runtime, enable_builtin].contains('libidn')
+    error('You requested libidn but it is not installed.')
+  endif
+endif
+
+if libidn2_dep.found() or libidn_dep.found()
+  # Check for libunistring, we need it for psl_str_to_utf8lower()
+  libunistring = cc.find_library('unistring')
+endif
+
+if host_machine.system() == 'windows'
+  networking_deps = cc.find_library('ws2_32')
+endif
+
+if enable_runtime == 'auto'
+  enable_runtime = 'no'
+endif
+if enable_builtin == 'auto'
+  enable_builtin = 'no'
+endif
+
+config = configuration_data()
+config.set_quoted('PACKAGE_VERSION', meson.project_version())
+config.set('WITH_LIBIDN2', enable_runtime == 'libidn2')
+config.set('WITH_LIBICU', enable_runtime == 'libicu')
+config.set('WITH_LIBIDN', enable_runtime == 'libidn')
+config.set('BUILTIN_GENERATOR_LIBIDN2', enable_builtin == 'libidn2')
+config.set('BUILTIN_GENERATOR_LIBICU', enable_builtin == 'libicu')
+config.set('BUILTIN_GENERATOR_LIBIDN', enable_builtin == 'libidn')
+config.set('HAVE_UNISTD_H', cc.check_header('unistd.h'))
+config.set('HAVE_STDINT_H', cc.check_header('stdint.h'))
+config.set('HAVE_ALLOCA_H', cc.check_header('alloca.h'))
+config.set('HAVE_ALLOCA', cc.has_function('alloca'))
+config.set('HAVE_STRNDUP', cc.has_function('strndup'))
+config.set('HAVE_CLOCK_GETTIME', cc.has_function('clock_gettime'))
+config.set('HAVE_FMEMOPEN', cc.has_function('fmemopen'))
+config.set('HAVE_NL_LANGINFO', cc.has_function('nl_langinfo'))
+configure_file(output : 'config.h', configuration : config)
+
+configinc = include_directories('.')
+includedir = include_directories('include')
+
+psl_distfile = get_option('psl_distfile')
+psl_file = get_option('psl_file')
+if psl_file == ''
+  psl_file = join_paths(meson.current_source_dir(), 'list', 'public_suffix_list.dat')
+endif
+psl_test_file = get_option('psl_testfile')
+if psl_test_file == ''
+  psl_test_file = join_paths(meson.current_source_dir(), 'list', 'tests', 'tests.txt')
+endif
+
+python = import('python').find_installation()
+pkgconfig = import('pkgconfig')
+
+if cc.get_id() == 'msvc'
+  if not cc.has_header_symbol('stdio.h', 'snprintf')
+    if cc.has_header_symbol('stdio.h', '_snprintf')
+      add_project_arguments('-Dsnprintf=_snprintf', language: 'c')
+    endif
+  endif
+  if cc.has_header_symbol('malloc.h', '_alloca')
+    add_project_arguments('-Dalloca=_alloca', language: 'c')
+  endif
+endif
+
+subdir('include')
+subdir('src')
+subdir('tools')
+subdir('tests')
+subdir('fuzz')
diff -Nru libpsl-0.20.2/meson_options.txt libpsl-0.21.0/meson_options.txt
--- libpsl-0.20.2/meson_options.txt	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/meson_options.txt	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,16 @@
+option('runtime', type : 'combo',
+  choices : ['libidn2', 'libicu', 'libidn', 'no', 'auto'], value : 'auto',
+  description : 'Specify the IDNA library used for libpsl run-time conversions')
+
+option('builtin', type : 'combo',
+  choices : ['libidn2', 'libicu', 'libidn', 'no', 'auto'], value : 'auto',
+  description : 'Specify the IDNA library used for built-in data generation')
+
+option('psl_distfile', type : 'string', value : '',
+  description : 'path to distribution-wide PSL file')
+
+option('psl_file', type : 'string', value : '',
+  description : 'path to PSL file')
+
+option('psl_testfile', type : 'string', value : '',
+  description : 'path to PSL test file')
diff -Nru libpsl-0.20.2/msvc/build-rules-msvc.mak libpsl-0.21.0/msvc/build-rules-msvc.mak
--- libpsl-0.20.2/msvc/build-rules-msvc.mak	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/msvc/build-rules-msvc.mak	2019-04-16 13:10:17.000000000 +0000
@@ -24,8 +24,8 @@
 $<
 <<
 
-# Make sure we generate suffixes_dafsa.c before trying to compile psl.c
-$(CFG)\$(PLAT)\libpsl\psl.obj: $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.c
+# Make sure we generate suffixes_dafsa.h before trying to compile psl.c
+$(CFG)\$(PLAT)\libpsl\psl.obj: $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.h
 
 # Inference rules for building the test programs
 # Used for programs with a single source file.
@@ -104,7 +104,7 @@
 	@-del /f /q $(CFG)\$(PLAT)\*.ilk
 	@-if exist $(CFG)\$(PLAT)\tests del /f /q $(CFG)\$(PLAT)\tests\*.obj
 	@-del /f /q $(CFG)\$(PLAT)\libpsl\*.obj
-	@-del /f /q $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.c
+	@-del /f /q $(CFG)\$(PLAT)\libpsl\suffixes_dafsa.h
 	@-del /f /q ..\config.h
 	@-del /f /q vc$(PDBVER)0.pdb
 	@-rmdir /s /q $(CFG)\$(PLAT)
diff -Nru libpsl-0.20.2/msvc/detectenv-msvc.mak libpsl-0.21.0/msvc/detectenv-msvc.mak
--- libpsl-0.20.2/msvc/detectenv-msvc.mak	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/msvc/detectenv-msvc.mak	2019-04-16 13:10:17.000000000 +0000
@@ -25,7 +25,7 @@
 # the g-ir-scanner Python script and g-ir-compiler utility program needs to be found
 # in $(PREFIX)\bin, together with any DLLs they will depend on, if those DLLs are not already
 # in your PATH.
-# Note that the Python interpretor and the introspection modules and utility progam must
+# Note that the Python interpretor and the introspection modules and utility program must
 # correspond to the build type (i.e. 32-bit Release for 32-bit Release builds, and so on).
 #
 # For introspection, currently only Python 2.7.x is supported.  This may change when Python 3.x
diff -Nru libpsl-0.20.2/msvc/generate-msvc.mak libpsl-0.21.0/msvc/generate-msvc.mak
--- libpsl-0.20.2/msvc/generate-msvc.mak	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/msvc/generate-msvc.mak	2019-04-16 13:10:17.000000000 +0000
@@ -9,7 +9,7 @@
 $(CFG)\$(PLAT)\tests:
 	@-md $@
 
-$(CFG)\$(PLAT)\libpsl\suffixes_dafsa.c: $(CFG)\$(PLAT)\libpsl $(PSL_FILE) ..\src\psl-make-dafsa
+$(CFG)\$(PLAT)\libpsl\suffixes_dafsa.h: $(CFG)\$(PLAT)\libpsl $(PSL_FILE) ..\src\psl-make-dafsa
 	@echo Generating $@
 	$(PYTHON) ..\src\psl-make-dafsa --output-format=cxx+ "$(PSL_FILE_INPUT)" $@
 
diff -Nru libpsl-0.20.2/msvc/libpsl-pc.py libpsl-0.21.0/msvc/libpsl-pc.py
--- libpsl-0.20.2/msvc/libpsl-pc.py	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/msvc/libpsl-pc.py	2019-04-16 13:10:17.000000000 +0000
@@ -28,5 +28,7 @@
                   base_pc.srcdir + '/libpsl.pc',
                   pc_replace_items)
 
+    return 0
+
 if __name__ == '__main__':
-    sys.exit(main(sys.argv))
\ No newline at end of file
+    sys.exit(main(sys.argv))
diff -Nru libpsl-0.20.2/msvc/pc_base.py libpsl-0.21.0/msvc/pc_base.py
--- libpsl-0.20.2/msvc/pc_base.py	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/msvc/pc_base.py	2019-04-16 13:10:17.000000000 +0000
@@ -12,7 +12,6 @@
 # Date: March 10, 2016
 
 import os
-import sys
 import argparse
 
 class BasePCItems:
@@ -55,7 +54,7 @@
 
         # check and setup the exec_prefix
         if getattr(args, 'exec_prefix', None) is None:
-            exec_prefix_use_shorthand = True
+            # exec_prefix_use_shorthand = True
             self.exec_prefix = '${prefix}'
         else:
             if args.exec_prefix.startswith('${prefix}'):
diff -Nru libpsl-0.20.2/msvc/replace.py libpsl-0.21.0/msvc/replace.py
--- libpsl-0.20.2/msvc/replace.py	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/msvc/replace.py	2019-04-16 13:10:17.000000000 +0000
@@ -10,10 +10,8 @@
 # Author: Fan, Chun-wei
 # Date: September 03, 2014
 
-import os
 import sys
 import re
-import string
 import argparse
 
 valid_actions = ['remove-prefix',
@@ -111,5 +109,7 @@
 
     replace(args.input, args.output, input_string, output_string)
 
+    return 0
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv))
diff -Nru libpsl-0.20.2/NEWS libpsl-0.21.0/NEWS
--- libpsl-0.20.2/NEWS	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/NEWS	2019-04-16 13:10:17.000000000 +0000
@@ -1,4 +1,12 @@
-Copyright (C) 2014-2018 Tim Rühsen
+Copyright (C) 2014-2019 Tim Rühsen
+
+16.04.2019 Release V0.21.0
+  * Add -b/--batch to 'psl' to suppress printing the domain
+  * Add support for Meson build system
+  * Improve build system
+  * Improve Windows compatibility
+  * Remove NLS / gettext
+  * Several cleanups and cosmetics
 
 26.04.2018 Release V0.20.2
   * Fix non srcdir builds
diff -Nru libpsl-0.20.2/README.md libpsl-0.21.0/README.md
--- libpsl-0.20.2/README.md	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/README.md	2019-04-16 13:10:17.000000000 +0000
@@ -39,9 +39,9 @@
 
 Find more information about the Public Suffix List [here](https://publicsuffix.org/).
 
-Download the Public Suffix List [here](https://hg.mozilla.org/mozilla-central/raw-file/tip/netwerk/dns/effective_tld_names.dat).
+Download the Public Suffix List [here](https://github.com/publicsuffix/list/blob/master/public_suffix_list.dat).
 
-The DAFSA code has been taken from [Chromium Project](https://code.google.com/p/chromium/).
+The original DAFSA code is from the [Chromium Project](https://code.google.com/p/chromium/).
 
 
 API Documentation
@@ -119,11 +119,19 @@
 		make
 		make check
 
+If you prefer a `meson` build
+
+		meson builddir
+		ninja -C builddir
+		ninja -C builddir test
+
+There is also an unofficial MSVC nmake build configuration in `msvc/`.
+
 
 Mailing List
 ------------
 
-[Mailing List Archive](http://news.gmane.org/gmane.network.dns.libpsl.bugs)
+[Mailing List Archive](https://groups.google.com/forum/#!forum/libpsl-bugs)
 
 [Mailing List](https://groups.google.com/forum/#!forum/libpsl-bugs)
 
diff -Nru libpsl-0.20.2/src/Makefile.am libpsl-0.21.0/src/Makefile.am
--- libpsl-0.20.2/src/Makefile.am	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/src/Makefile.am	2019-04-16 13:10:17.000000000 +0000
@@ -1,10 +1,10 @@
 include libpsl-srcs.mk
 
 # suffixes.c must be created before psl.c is compiled
-BUILT_SOURCES = suffixes_dafsa.c
+BUILT_SOURCES = suffixes_dafsa.h
 
 # suffixes.c is a built source that must be cleaned
-CLEANFILES = suffixes_dafsa.c
+CLEANFILES = suffixes_dafsa.h
 
 lib_LTLIBRARIES = libpsl.la
 
@@ -15,20 +15,11 @@
 
 # include ABI version information
 libpsl_la_LDFLAGS = -no-undefined -version-info $(LIBPSL_SO_VERSION)
-if WITH_LIBICU
-  libpsl_la_LDFLAGS += $(LIBICU_LIBS)
-endif
-if WITH_LIBIDN2
-  libpsl_la_LDFLAGS += -lidn2 -lunistring
-endif
-if WITH_LIBIDN
-  libpsl_la_LDFLAGS += -lidn -lunistring
-endif
 
 # Build rule for suffix_dafsa.c
 # PSL_FILE can be set by ./configure --with-psl-file=[PATH]
-suffixes_dafsa.c: $(PSL_FILE) $(srcdir)/psl-make-dafsa
-	$(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.c
+suffixes_dafsa.h: $(PSL_FILE) $(srcdir)/psl-make-dafsa
+	$(srcdir)/psl-make-dafsa --output-format=cxx+ "$(PSL_FILE)" suffixes_dafsa.h
 
 EXTRA_DIST = psl-make-dafsa LICENSE.chromium
 
diff -Nru libpsl-0.20.2/src/meson.build libpsl-0.21.0/src/meson.build
--- libpsl-0.20.2/src/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/src/meson.build	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,31 @@
+psl_make_dafsa = find_program('psl-make-dafsa')
+
+suffixes_dafsa_h = custom_target('suffixes_dafsa.h',
+  input : psl_file,
+  output : 'suffixes_dafsa.h',
+  command : [psl_make_dafsa, '--output-format=cxx+', '@INPUT@', '@OUTPUT@'])
+
+sources = [
+  'lookup_string_in_fixed_set.c',
+  'psl.c',
+]
+
+cargs = [
+  '-DHAVE_CONFIG_H',
+  '-DBUILDING_PSL',
+  '-DPSL_DISTFILE="@0@"'.format(psl_distfile),
+]
+
+libpsl = library('psl', sources, suffixes_dafsa_h,
+  include_directories : [configinc, includedir],
+  c_args : cargs,
+  dependencies : [libidn2_dep, libidn_dep, libicu_dep, libunistring, networking_deps],
+  install: true,
+)
+
+pkgconfig.generate(libpsl,
+  name : 'libpsl',
+  description : 'Public Suffix List C library')
+
+libpsl_dep = declare_dependency(link_with : libpsl,
+  include_directories : includedir)
diff -Nru libpsl-0.20.2/src/psl.c libpsl-0.21.0/src/psl.c
--- libpsl-0.20.2/src/psl.c	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/src/psl.c	2019-04-16 13:10:17.000000000 +0000
@@ -33,32 +33,21 @@
 #endif
 
 #if defined(__GNUC__) && defined(__GNUC_MINOR__)
-#       define _GCC_VERSION_AT_LEAST(major, minor) ((__GNUC__ > (major)) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
+#       define GCC_VERSION_AT_LEAST(major, minor) ((__GNUC__ > (major)) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
 #else
-#       define _GCC_VERSION_AT_LEAST(major, minor) 0
+#       define GCC_VERSION_AT_LEAST(major, minor) 0
 #endif
 
-#if _GCC_VERSION_AT_LEAST(2,95)
-#  define _UNUSED __attribute__ ((unused))
+#if GCC_VERSION_AT_LEAST(2,95)
+#  define PSL_UNUSED __attribute__ ((unused))
 #else
-#  define _UNUSED
-#endif
-
-#if ENABLE_NLS != 0
-#	include <libintl.h>
-#	define _(STRING) gettext(STRING)
-#else
-#	define _(STRING) STRING
-#	define ngettext(STRING1,STRING2,N) STRING2
+#  define PSL_UNUSED
 #endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #ifdef _WIN32
-/* This is for Windows Vista and later, for inet_pton() */
-# define _WIN32_WINNT 0x0600
-
 # include <winsock2.h>
 # include <ws2tcpip.h>
 #else
@@ -67,6 +56,11 @@
 # include <unistd.h>
 #endif
 
+#if defined(_MSC_VER) && ! defined(ssize_t)
+# include <basetsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -121,11 +115,11 @@
 
 #define countof(a) (sizeof(a)/sizeof(*(a)))
 
-#define _PSL_FLAG_EXCEPTION (1<<0)
-#define _PSL_FLAG_WILDCARD  (1<<1)
-#define _PSL_FLAG_ICANN     (1<<2) /* entry of ICANN section */
-#define _PSL_FLAG_PRIVATE   (1<<3) /* entry of PRIVATE section */
-#define _PSL_FLAG_PLAIN     (1<<4) /* just used for PSL syntax checking */
+#define PRIV_PSL_FLAG_EXCEPTION (1<<0)
+#define PRIV_PSL_FLAG_WILDCARD  (1<<1)
+#define PRIV_PSL_FLAG_ICANN     (1<<2) /* entry of ICANN section */
+#define PRIV_PSL_FLAG_PRIVATE   (1<<3) /* entry of PRIVATE section */
+#define PRIV_PSL_FLAG_PLAIN     (1<<4) /* just used for PSL syntax checking */
 
 typedef struct {
 	char
@@ -137,21 +131,21 @@
 	unsigned char
 		nlabels, /* number of labels */
 		flags;
-} _psl_entry_t;
+} psl_entry_t;
 
 /* stripped down version libmget vector routines */
 typedef struct {
 	int
-		(*cmp)(const _psl_entry_t **, const _psl_entry_t **); /* comparison function */
-	_psl_entry_t
+		(*cmp)(const psl_entry_t **, const psl_entry_t **); /* comparison function */
+	psl_entry_t
 		**entry; /* pointer to array of pointers to elements */
 	int
 		max,     /* allocated elements */
 		cur;     /* number of elements in use */
-} _psl_vector_t;
+} psl_vector_t;
 
-struct _psl_ctx_st {
-	_psl_vector_t
+struct psl_ctx_st {
+	psl_vector_t
 		*suffixes;
 	unsigned char
 		*dafsa;
@@ -167,7 +161,7 @@
 
 /* include the PSL data generated by psl-make-dafsa */
 #if defined(BUILTIN_GENERATOR_LIBICU) || defined(BUILTIN_GENERATOR_LIBIDN2) || defined(BUILTIN_GENERATOR_LIBIDN)
-#include "suffixes_dafsa.c"
+#include "suffixes_dafsa.h"
 #else
 static const unsigned char kDafsa[] = "";
 static time_t _psl_file_time = 0;
@@ -180,7 +174,7 @@
 
 /* references to these PSLs will result in lookups to built-in data */
 static const psl_ctx_t
-	_builtin_psl;
+	builtin_psl;
 
 #ifdef PSL_DISTFILE
 static const char _psl_dist_filename[] = PSL_DISTFILE;
@@ -188,14 +182,14 @@
 static const char _psl_dist_filename[] = "";
 #endif
 
-static _psl_vector_t *_vector_alloc(int max, int (*cmp)(const _psl_entry_t **, const _psl_entry_t **))
+static psl_vector_t *vector_alloc(int max, int (*cmp)(const psl_entry_t **, const psl_entry_t **))
 {
-	_psl_vector_t *v;
+	psl_vector_t *v;
 
-	if (!(v = calloc(1, sizeof(_psl_vector_t))))
+	if (!(v = calloc(1, sizeof(psl_vector_t))))
 		return NULL;
 
-	if (!(v->entry = malloc(max * sizeof(_psl_entry_t *)))) {
+	if (!(v->entry = malloc(max * sizeof(psl_entry_t *)))) {
 		free(v);
 		return NULL;
 	}
@@ -205,7 +199,7 @@
 	return v;
 }
 
-static void _vector_free(_psl_vector_t **v)
+static void vector_free(psl_vector_t **v)
 {
 	if (v && *v) {
 		if ((*v)->entry) {
@@ -220,7 +214,7 @@
 	}
 }
 
-static _psl_entry_t *_vector_get(const _psl_vector_t *v, int pos)
+static psl_entry_t *vector_get(const psl_vector_t *v, int pos)
 {
 	if (pos < 0 || !v || pos >= v->cur) return NULL;
 
@@ -228,7 +222,7 @@
 }
 
 /* the entries must be sorted by */
-static int _vector_find(const _psl_vector_t *v, const _psl_entry_t *elem)
+static int vector_find(const psl_vector_t *v, const psl_entry_t *elem)
 {
 	if (v) {
 		int l, r, m;
@@ -237,7 +231,7 @@
 		/* binary search for element (exact match) */
 		for (l = 0, r = v->cur - 1; l <= r;) {
 			m = (l + r) / 2;
-			if ((res = v->cmp(&elem, (const _psl_entry_t **)&(v->entry[m]))) > 0) l = m + 1;
+			if ((res = v->cmp(&elem, (const psl_entry_t **)&(v->entry[m]))) > 0) l = m + 1;
 			else if (res < 0) r = m - 1;
 			else return m;
 		}
@@ -246,18 +240,18 @@
 	return -1; /* not found */
 }
 
-static int _vector_add(_psl_vector_t *v, const _psl_entry_t *elem)
+static int vector_add(psl_vector_t *v, const psl_entry_t *elem)
 {
 	if (v) {
 		void *elemp;
 
-		if (!(elemp = malloc(sizeof(_psl_entry_t))))
+		if (!(elemp = malloc(sizeof(psl_entry_t))))
 			return -1;
 
-		memcpy(elemp, elem, sizeof(_psl_entry_t));
+		memcpy(elemp, elem, sizeof(psl_entry_t));
 
 		if (v->max == v->cur) {
-			void *m = realloc(v->entry, (v->max *= 2) * sizeof(_psl_entry_t *));
+			void *m = realloc(v->entry, (v->max *= 2) * sizeof(psl_entry_t *));
 
 			if (m)
 				v->entry = m;
@@ -274,14 +268,14 @@
 	return -1;
 }
 
-static void _vector_sort(_psl_vector_t *v)
+static void vector_sort(psl_vector_t *v)
 {
 	if (v && v->cmp)
-		qsort(v->entry, v->cur, sizeof(_psl_vector_t **), (int(*)(const void *, const void *))v->cmp);
+		qsort(v->entry, v->cur, sizeof(psl_vector_t **), (int(*)(const void *, const void *))v->cmp);
 }
 
 /* by this kind of sorting, we can easily see if a domain matches or not */
-static int _suffix_compare(const _psl_entry_t *s1, const _psl_entry_t *s2)
+static int suffix_compare(const psl_entry_t *s1, const psl_entry_t *s2)
 {
 	int n;
 
@@ -295,12 +289,12 @@
 }
 
 /* needed to sort array of pointers, given to qsort() */
-static int _suffix_compare_array(const _psl_entry_t **s1, const _psl_entry_t **s2)
+static int suffix_compare_array(const psl_entry_t **s1, const psl_entry_t **s2)
 {
-	return _suffix_compare(*s1, *s2);
+	return suffix_compare(*s1, *s2);
 }
 
-static int _suffix_init(_psl_entry_t *suffix, const char *rule, size_t length)
+static int suffix_init(psl_entry_t *suffix, const char *rule, size_t length)
 {
 	const char *src;
 	char *dst;
@@ -309,7 +303,7 @@
 
 	if (length >= sizeof(suffix->label_buf) - 1) {
 		suffix->nlabels = 0;
-		/* fprintf(stderr, _("Suffix rule too long (%zd, ignored): %s\n"), length, rule); */
+		/* fprintf(stderr, "Suffix rule too long (%zd, ignored): %s\n", length, rule); */
 		return -1;
 	}
 
@@ -512,7 +506,7 @@
 	return punycode_success;
 }
 
-static ssize_t _utf8_to_utf32(const char *in, size_t inlen, punycode_uint *out, size_t outlen)
+static ssize_t utf8_to_utf32(const char *in, size_t inlen, punycode_uint *out, size_t outlen)
 {
 	size_t n = 0;
 	const unsigned char *s = (void *)in;
@@ -553,7 +547,7 @@
 	return n;
 }
 
-static int _mem_is_ascii(const char *s, size_t n)
+static int mem_is_ascii(const char *s, size_t n)
 {
 	for (; n; n--) /* 'while(n--)' generates unsigned integer overflow on n = 0 */
 		if (*((unsigned char *)s++) >= 128)
@@ -562,7 +556,7 @@
 	return 1;
 }
 
-static int _domain_to_punycode(const char *domain, char *out, size_t outsize)
+static int domain_to_punycode(const char *domain, char *out, size_t outsize)
 {
 	size_t outlen = 0, labellen;
 	punycode_uint input[256];
@@ -573,7 +567,7 @@
 		labellen = e ? (size_t) (e - label) : strlen(label);
 		/* printf("s=%s inlen=%zd\n", label, labellen); */
 
-		if (_mem_is_ascii(label, labellen)) {
+		if (mem_is_ascii(label, labellen)) {
 			if (outlen + labellen + (e != NULL) >= outsize)
 				return 1;
 
@@ -586,7 +580,7 @@
 			if (outlen + labellen + (e != NULL) + 4 >= outsize)
 				return 1;
 
-			if ((inputlen = _utf8_to_utf32(label, labellen, input, countof(input))) < 0)
+			if ((inputlen = utf8_to_utf32(label, labellen, input, countof(input))) < 0)
 				return 1;
 
 			memcpy(out + outlen, "xn--", 4);
@@ -608,12 +602,12 @@
 }
 #endif
 
-static int _isspace_ascii(const char c)
+static int isspace_ascii(const char c)
 {
 	return c == ' ' || c == '\t' || c == '\r' || c == '\n';
 }
 
-static int _str_is_ascii(const char *s)
+static int str_is_ascii(const char *s)
 {
 	while (*s && *((unsigned char *)s) < 128) s++;
 
@@ -631,7 +625,7 @@
  * [2] https://lists.gnu.org/archive/html/bug-wget/2015-06/msg00002.html
  * [3] https://curl.haxx.se/mail/lib-2015-06/0143.html
  */
-static int _utf8_is_valid(const char *utf8)
+static int utf8_is_valid(const char *utf8)
 {
 	const unsigned char *s = (const unsigned char *) utf8;
 
@@ -658,9 +652,9 @@
 }
 #endif
 
-typedef void *_psl_idna_t;
+typedef void *psl_idna_t;
 
-static _psl_idna_t *_psl_idna_open(void)
+static psl_idna_t *psl_idna_open(void)
 {
 #if defined(WITH_LIBICU)
 	UErrorCode status = 0;
@@ -669,7 +663,7 @@
 	return NULL;
 }
 
-static void _psl_idna_close(_psl_idna_t *idna _UNUSED)
+static void psl_idna_close(psl_idna_t *idna PSL_UNUSED)
 {
 #if defined(WITH_LIBICU)
 	if (idna)
@@ -677,7 +671,7 @@
 #endif
 }
 
-static int _psl_idna_toASCII(_psl_idna_t *idna _UNUSED, const char *utf8, char **ascii)
+static int psl_idna_toASCII(psl_idna_t *idna PSL_UNUSED, const char *utf8, char **ascii)
 {
 	int ret = -1;
 
@@ -773,8 +767,8 @@
 #elif defined(WITH_LIBIDN)
 	int rc;
 
-	if (!_utf8_is_valid(utf8)) {
-		/* fprintf(_(stderr, "Invalid UTF-8 sequence not converted: '%s'\n"), utf8); */
+	if (!utf8_is_valid(utf8)) {
+		/* fprintf(stderr, "Invalid UTF-8 sequence not converted: '%s'\n", utf8); */
 		return -1;
 	}
 
@@ -783,11 +777,11 @@
 	if ((rc = idna_to_ascii_8z(utf8, ascii, IDNA_USE_STD3_ASCII_RULES)) == IDNA_SUCCESS) {
 		ret = 0;
 	} /* else
-		fprintf(_(stderr, "toASCII failed (%d): %s\n"), rc, idna_strerror(rc)); */
+		fprintf(stderr, "toASCII failed (%d): %s\n", rc, idna_strerror(rc)); */
 #else
 	char lookupname[128];
 
-	if (_domain_to_punycode(utf8, lookupname, sizeof(lookupname)) == 0) {
+	if (domain_to_punycode(utf8, lookupname, sizeof(lookupname)) == 0) {
 		if (ascii)
 			if ((*ascii = strdup(lookupname)))
 				ret = 0;
@@ -797,21 +791,21 @@
 	return ret;
 }
 
-static void _add_punycode_if_needed(_psl_idna_t *idna, _psl_vector_t *v, _psl_entry_t *e)
+static void add_punycode_if_needed(psl_idna_t *idna, psl_vector_t *v, psl_entry_t *e)
 {
 	char *lookupname;
 
-	if (_str_is_ascii(e->label_buf))
+	if (str_is_ascii(e->label_buf))
 		return;
 
-	if (_psl_idna_toASCII(idna, e->label_buf, &lookupname) == 0) {
+	if (psl_idna_toASCII(idna, e->label_buf, &lookupname) == 0) {
 		if (strcmp(e->label_buf, lookupname)) {
-			_psl_entry_t suffix, *suffixp;
+			psl_entry_t suffix, *suffixp;
 
 			/* fprintf(stderr, "toASCII '%s' -> '%s'\n", e->label_buf, lookupname); */
-			if (_suffix_init(&suffix, lookupname, strlen(lookupname)) == 0) {
+			if (suffix_init(&suffix, lookupname, strlen(lookupname)) == 0) {
 				suffix.flags = e->flags;
-				if ((suffixp = _vector_get(v, _vector_add(v, &suffix))))
+				if ((suffixp = vector_get(v, vector_add(v, &suffix))))
 					suffixp->label = suffixp->label_buf; /* set label to changed address */
 			}
 		} /* else ignore */
@@ -824,9 +818,9 @@
 int LookupStringInFixedSet(const unsigned char* graph, size_t length, const char* key, size_t key_length);
 int GetUtfMode(const unsigned char *graph, size_t length);
 
-static int _psl_is_public_suffix(const psl_ctx_t *psl, const char *domain, int type)
+static int is_public_suffix(const psl_ctx_t *psl, const char *domain, int type)
 {
-	_psl_entry_t suffix;
+	psl_entry_t suffix;
 	const char *p;
 	char *punycode = NULL;
 	int need_conversion = 0;
@@ -853,18 +847,13 @@
 
 	type &= ~PSL_TYPE_NO_STAR_RULE;
 
-	if (psl->utf8 || psl == &_builtin_psl)
-		need_conversion = 0;
-
-#if defined(WITH_LIBIDN) || defined(WITH_LIBIDN2) || defined(WITH_LIBICU)
-	if (psl == &_builtin_psl)
+	if (psl->utf8 || psl == &builtin_psl)
 		need_conversion = 0;
-#endif
 
 	if (need_conversion) {
-		_psl_idna_t *idna = _psl_idna_open();
+		psl_idna_t *idna = psl_idna_open();
 
-		if (_psl_idna_toASCII(idna, domain, &punycode) == 0) {
+		if (psl_idna_toASCII(idna, domain, &punycode) == 0) {
 			suffix.label = punycode;
 			suffix.length = strlen(punycode);
 		} else {
@@ -874,24 +863,24 @@
 			suffix.length = p - suffix.label;
 		}
 
-		_psl_idna_close(idna);
+		psl_idna_close(idna);
 	} else {
 		suffix.label = domain;
 		suffix.length = p - suffix.label;
 	}
 
-	if (psl == &_builtin_psl || psl->dafsa) {
-		size_t dafsa_size = psl == &_builtin_psl ? sizeof(kDafsa) : psl->dafsa_size;
-		const unsigned char *dafsa = psl == &_builtin_psl ? kDafsa : psl->dafsa;
+	if (psl == &builtin_psl || psl->dafsa) {
+		size_t dafsa_size = psl == &builtin_psl ? sizeof(kDafsa) : psl->dafsa_size;
+		const unsigned char *dafsa = psl == &builtin_psl ? kDafsa : psl->dafsa;
 		int rc = LookupStringInFixedSet(dafsa, dafsa_size, suffix.label, suffix.length);
 		if (rc != -1) {
 			/* check for correct rule type */
-			if (type == PSL_TYPE_ICANN && !(rc & _PSL_FLAG_ICANN))
+			if (type == PSL_TYPE_ICANN && !(rc & PRIV_PSL_FLAG_ICANN))
 				goto suffix_no;
-			else if (type == PSL_TYPE_PRIVATE && !(rc & _PSL_FLAG_PRIVATE))
+			else if (type == PSL_TYPE_PRIVATE && !(rc & PRIV_PSL_FLAG_PRIVATE))
 				goto suffix_no;
 
-			if (rc & _PSL_FLAG_EXCEPTION)
+			if (rc & PRIV_PSL_FLAG_EXCEPTION)
 				goto suffix_no;
 
 			/* wildcard *.foo.bar implicitly make foo.bar a public suffix */
@@ -906,31 +895,31 @@
 			rc = LookupStringInFixedSet(dafsa, dafsa_size, suffix.label, suffix.length);
 			if (rc != -1) {
 				/* check for correct rule type */
-				if (type == PSL_TYPE_ICANN && !(rc & _PSL_FLAG_ICANN))
+				if (type == PSL_TYPE_ICANN && !(rc & PRIV_PSL_FLAG_ICANN))
 					goto suffix_no;
-				else if (type == PSL_TYPE_PRIVATE && !(rc & _PSL_FLAG_PRIVATE))
+				else if (type == PSL_TYPE_PRIVATE && !(rc & PRIV_PSL_FLAG_PRIVATE))
 					goto suffix_no;
 
-				if (rc & _PSL_FLAG_WILDCARD)
+				if (rc & PRIV_PSL_FLAG_WILDCARD)
 					goto suffix_yes;
 			}
 		}
 	} else {
-		_psl_entry_t *rule = _vector_get(psl->suffixes, 0);
+		psl_entry_t *rule = vector_get(psl->suffixes, 0);
 
 		if (!rule || rule->nlabels < suffix.nlabels - 1)
 			goto suffix_no;
 
-		rule = _vector_get(psl->suffixes, _vector_find(psl->suffixes, &suffix));
+		rule = vector_get(psl->suffixes, vector_find(psl->suffixes, &suffix));
 
 		if (rule) {
 			/* check for correct rule type */
-			if (type == PSL_TYPE_ICANN && !(rule->flags & _PSL_FLAG_ICANN))
+			if (type == PSL_TYPE_ICANN && !(rule->flags & PRIV_PSL_FLAG_ICANN))
 				goto suffix_no;
-			else if (type == PSL_TYPE_PRIVATE && !(rule->flags & _PSL_FLAG_PRIVATE))
+			else if (type == PSL_TYPE_PRIVATE && !(rule->flags & PRIV_PSL_FLAG_PRIVATE))
 				goto suffix_no;
 
-			if (rule->flags & _PSL_FLAG_EXCEPTION)
+			if (rule->flags & PRIV_PSL_FLAG_EXCEPTION)
 				goto suffix_no;
 
 			/* wildcard *.foo.bar implicitly make foo.bar a public suffix */
@@ -945,16 +934,16 @@
 			suffix.length = strlen(suffix.label);
 			suffix.nlabels--;
 
-			rule = _vector_get(psl->suffixes, (pos = _vector_find(psl->suffixes, &suffix)));
+			rule = vector_get(psl->suffixes, (pos = vector_find(psl->suffixes, &suffix)));
 
 			if (rule) {
 				/* check for correct rule type */
-				if (type == PSL_TYPE_ICANN && !(rule->flags & _PSL_FLAG_ICANN))
+				if (type == PSL_TYPE_ICANN && !(rule->flags & PRIV_PSL_FLAG_ICANN))
 					goto suffix_no;
-				else if (type == PSL_TYPE_PRIVATE && !(rule->flags & _PSL_FLAG_PRIVATE))
+				else if (type == PSL_TYPE_PRIVATE && !(rule->flags & PRIV_PSL_FLAG_PRIVATE))
 					goto suffix_no;
 
-				if (rule->flags & _PSL_FLAG_WILDCARD)
+				if (rule->flags & PRIV_PSL_FLAG_WILDCARD)
 					goto suffix_yes;
 			}
 		}
@@ -997,7 +986,7 @@
 	if (!psl || !domain)
 		return 1;
 
-	return _psl_is_public_suffix(psl, domain, PSL_TYPE_ANY);
+	return is_public_suffix(psl, domain, PSL_TYPE_ANY);
 }
 
 /**
@@ -1032,7 +1021,7 @@
 	if (!psl || !domain)
 		return 1;
 
-	return _psl_is_public_suffix(psl, domain, type);
+	return is_public_suffix(psl, domain, type);
 }
 
 /**
@@ -1079,11 +1068,11 @@
 	 *   'forgot.his.name' and 'name' are in the PSL while 'his.name' is not.
 	 */
 
-	while (!_psl_is_public_suffix(psl, domain, 0)) {
+	while (!is_public_suffix(psl, domain, 0)) {
 		if ((domain = strchr(domain, '.')))
 			domain++;
 		else
-			break; /* prevent endless loop if psl_is_public_suffix() is broken. */
+			break; /* prevent endless loop if is_public_suffix() is broken. */
 	}
 
 	return domain;
@@ -1133,12 +1122,12 @@
 	 *   'forgot.his.name' and 'name' are in the PSL while 'his.name' is not.
 	 */
 
-	while (!_psl_is_public_suffix(psl, domain, 0)) {
+	while (!is_public_suffix(psl, domain, 0)) {
 		if ((p = strchr(domain, '.'))) {
 			regdom = domain;
 			domain = p + 1;
 		} else
-			break; /* prevent endless loop if psl_is_public_suffix() is broken. */
+			break; /* prevent endless loop if is_public_suffix() is broken. */
 	}
 
 	return regdom;
@@ -1165,7 +1154,7 @@
 	if (!fname)
 		return NULL;
 
-	if ((fp = fopen(fname, "r"))) {
+	if ((fp = fopen(fname, "rb"))) {
 		psl = psl_load_fp(fp);
 		fclose(fp);
 	}
@@ -1189,10 +1178,10 @@
 psl_ctx_t *psl_load_fp(FILE *fp)
 {
 	psl_ctx_t *psl;
-	_psl_entry_t suffix, *suffixp;
+	psl_entry_t suffix, *suffixp;
 	char buf[256], *linep, *p;
 	int type = 0, is_dafsa;
-	_psl_idna_t *idna;
+	psl_idna_t *idna;
 
 	if (!fp)
 		return NULL;
@@ -1240,61 +1229,62 @@
 		return psl;
 	}
 
-	idna = _psl_idna_open();
+	idna = psl_idna_open();
 
 	/*
 	 *  as of 02.11.2012, the list at https://publicsuffix.org/list/ contains ~6000 rules and 40 exceptions.
 	 *  as of 19.02.2014, the list at https://publicsuffix.org/list/ contains ~6500 rules and 19 exceptions.
+	 *  as of 07.10.2018, the list at https://publicsuffix.org/list/ contains ~8600 rules and 8 exceptions.
 	 */
-	psl->suffixes = _vector_alloc(8*1024, _suffix_compare_array);
+	psl->suffixes = vector_alloc(8*1024, suffix_compare_array);
 	psl->utf8 = 1; /* we put UTF-8 and punycode rules in the lookup vector */
 
 	do {
-		while (_isspace_ascii(*linep)) linep++; /* ignore leading whitespace */
+		while (isspace_ascii(*linep)) linep++; /* ignore leading whitespace */
 		if (!*linep) continue; /* skip empty lines */
 
 		if (*linep == '/' && linep[1] == '/') {
 			if (!type) {
 				if (strstr(linep + 2, "===BEGIN ICANN DOMAINS==="))
-					type = _PSL_FLAG_ICANN;
+					type = PRIV_PSL_FLAG_ICANN;
 				else if (!type && strstr(linep + 2, "===BEGIN PRIVATE DOMAINS==="))
-					type = _PSL_FLAG_PRIVATE;
+					type = PRIV_PSL_FLAG_PRIVATE;
 			}
-			else if (type == _PSL_FLAG_ICANN && strstr(linep + 2, "===END ICANN DOMAINS==="))
+			else if (type == PRIV_PSL_FLAG_ICANN && strstr(linep + 2, "===END ICANN DOMAINS==="))
 				type = 0;
-			else if (type == _PSL_FLAG_PRIVATE && strstr(linep + 2, "===END PRIVATE DOMAINS==="))
+			else if (type == PRIV_PSL_FLAG_PRIVATE && strstr(linep + 2, "===END PRIVATE DOMAINS==="))
 				type = 0;
 
 			continue; /* skip comments */
 		}
 
 		/* parse suffix rule */
-		for (p = linep; *linep && !_isspace_ascii(*linep);) linep++;
+		for (p = linep; *linep && !isspace_ascii(*linep);) linep++;
 		*linep = 0;
 
 		if (*p == '!') {
 			p++;
-			suffix.flags = _PSL_FLAG_EXCEPTION | type;
+			suffix.flags = PRIV_PSL_FLAG_EXCEPTION | type;
 			psl->nexceptions++;
 		} else if (*p == '*') {
 			if (*++p != '.') {
-				/* fprintf(stderr, _("Unsupported kind of rule (ignored): %s\n"), p - 1); */
+				/* fprintf(stderr, "Unsupported kind of rule (ignored): %s\n", p - 1); */
 				continue;
 			}
 			p++;
 			/* wildcard *.foo.bar implicitly make foo.bar a public suffix */
-			suffix.flags = _PSL_FLAG_WILDCARD | _PSL_FLAG_PLAIN | type;
+			suffix.flags = PRIV_PSL_FLAG_WILDCARD | PRIV_PSL_FLAG_PLAIN | type;
 			psl->nwildcards++;
 			psl->nsuffixes++;
 		} else {
-			suffix.flags = _PSL_FLAG_PLAIN | type;
+			suffix.flags = PRIV_PSL_FLAG_PLAIN | type;
 			psl->nsuffixes++;
 		}
 
-		if (_suffix_init(&suffix, p, linep - p) == 0) {
+		if (suffix_init(&suffix, p, linep - p) == 0) {
 			int index;
 
-			if ((index = _vector_find(psl->suffixes, &suffix)) >= 0) {
+			if ((index = vector_find(psl->suffixes, &suffix)) >= 0) {
 				/* Found existing entry:
 				 * Combination of exception and plain rule is ambiguous
 				 * !foo.bar
@@ -1307,23 +1297,23 @@
 				 * We do not check here, let's do it later.
 				 */
 
-				suffixp = _vector_get(psl->suffixes, index);
+				suffixp = vector_get(psl->suffixes, index);
 				suffixp->flags |= suffix.flags;
 			} else {
 				/* New entry */
-				suffixp = _vector_get(psl->suffixes, _vector_add(psl->suffixes, &suffix));
+				suffixp = vector_get(psl->suffixes, vector_add(psl->suffixes, &suffix));
 			}
 
 			if (suffixp) {
 				suffixp->label = suffixp->label_buf; /* set label to changed address */
-				_add_punycode_if_needed(idna, psl->suffixes, suffixp);
+				add_punycode_if_needed(idna, psl->suffixes, suffixp);
 			}
 		}
 	} while ((linep = fgets(buf, sizeof(buf), fp)));
 
-	_vector_sort(psl->suffixes);
+	vector_sort(psl->suffixes);
 
-	_psl_idna_close(idna);
+	psl_idna_close(idna);
 
 	return psl;
 
@@ -1343,8 +1333,8 @@
  */
 void psl_free(psl_ctx_t *psl)
 {
-	if (psl && psl != &_builtin_psl) {
-		_vector_free(&psl->suffixes);
+	if (psl && psl != &builtin_psl) {
+		vector_free(&psl->suffixes);
 		free(psl->dafsa);
 		free(psl);
 	}
@@ -1369,7 +1359,7 @@
 const psl_ctx_t *psl_builtin(void)
 {
 #if defined(BUILTIN_GENERATOR_LIBICU) || defined(BUILTIN_GENERATOR_LIBIDN2) || defined(BUILTIN_GENERATOR_LIBIDN)
-	return &_builtin_psl;
+	return &builtin_psl;
 #else
 	return NULL;
 #endif
@@ -1391,7 +1381,7 @@
  */
 int psl_suffix_count(const psl_ctx_t *psl)
 {
-	if (psl == &_builtin_psl)
+	if (psl == &builtin_psl)
 		return _psl_nsuffixes;
 	else if (psl)
 		return psl->dafsa ? -1 : psl->nsuffixes;
@@ -1414,7 +1404,7 @@
  */
 int psl_suffix_exception_count(const psl_ctx_t *psl)
 {
-	if (psl == &_builtin_psl)
+	if (psl == &builtin_psl)
 		return _psl_nexceptions;
 	else if (psl)
 		return psl->dafsa ? -1 : psl->nexceptions;
@@ -1437,7 +1427,7 @@
  */
 int psl_suffix_wildcard_count(const psl_ctx_t *psl)
 {
-	if (psl == &_builtin_psl)
+	if (psl == &builtin_psl)
 		return _psl_nwildcards;
 	else if (psl)
 		return psl->dafsa ? -1 : psl->nwildcards;
@@ -1588,12 +1578,28 @@
 }
 
 /* return whether hostname is an IP address or not */
-static int _isip(const char *hostname)
+static int isip(const char *hostname)
 {
+#ifdef _WIN32
+	WCHAR wName[INET6_ADDRSTRLEN+1];
+
+	struct sockaddr_in  addr  = {0};
+	struct sockaddr_in6 addr6 = {0};
+
+	INT size  = sizeof(addr);
+	INT size6 = sizeof(addr6);
+
+	if (!MultiByteToWideChar(CP_UTF8, 0, hostname, -1, wName, countof(wName)))
+		return 0;
+
+	return (WSAStringToAddressW(wName, AF_INET,  NULL, (struct sockaddr *)&addr,  &size) != SOCKET_ERROR) |
+	       (WSAStringToAddressW(wName, AF_INET6, NULL, (struct sockaddr *)&addr6, &size6) != SOCKET_ERROR);
+#else
 	struct in_addr addr;
 	struct in6_addr addr6;
 
 	return inet_pton(AF_INET, hostname, &addr) || inet_pton(AF_INET6, hostname, &addr6);
+#endif
 }
 
 /**
@@ -1635,7 +1641,7 @@
 	if (!strcmp(hostname, cookie_domain))
 		return 1; /* an exact match is acceptable (and pretty common) */
 
-	if (_isip(hostname))
+	if (isip(hostname))
 		return 0; /* Hostname is an IP address and these must match fully (RFC 6265, 5.1.3) */
 
 	cookie_domain_length = strlen(cookie_domain);
@@ -1698,7 +1704,7 @@
  *
  * Since: 0.4
  */
-psl_error_t psl_str_to_utf8lower(const char *str, const char *encoding _UNUSED, const char *locale _UNUSED, char **lower)
+psl_error_t psl_str_to_utf8lower(const char *str, const char *encoding PSL_UNUSED, const char *locale PSL_UNUSED, char **lower)
 {
 	int ret = PSL_ERR_INVALID_ARG;
 
@@ -1706,7 +1712,7 @@
 		return PSL_ERR_INVALID_ARG;
 
 	/* shortcut to avoid costly conversion */
-	if (_str_is_ascii(str)) {
+	if (str_is_ascii(str)) {
 		if (lower) {
 			char *p, *tmp;
 
@@ -1876,7 +1882,7 @@
 }
 
 /* if file is newer than the builtin data, insert it reverse sorted by mtime */
-static int _insert_file(const char *fname, const char **psl_fname, time_t *psl_mtime, int n)
+static int insert_file(const char *fname, const char **psl_fname, time_t *psl_mtime, int n)
 {
 	struct stat st;
 	int it;
@@ -1926,9 +1932,9 @@
 	psl_fname[0] = NULL; /* silence gcc 6.2 false warning */
 
 	/* create array of PSL files reverse sorted by mtime (latest first) */
-	ntimes = _insert_file(fname, psl_fname, psl_mtime, 0);
-	ntimes = _insert_file(_psl_dist_filename, psl_fname, psl_mtime, ntimes);
-	ntimes = _insert_file(_psl_filename, psl_fname, psl_mtime, ntimes);
+	ntimes = insert_file(fname, psl_fname, psl_mtime, 0);
+	ntimes = insert_file(_psl_dist_filename, psl_fname, psl_mtime, ntimes);
+	ntimes = insert_file(_psl_filename, psl_fname, psl_mtime, ntimes);
 
 	/* load PSL data from the latest file, falling back to the second recent, ... */
 	for (psl = NULL, it = 0; it < ntimes; it++) {
diff -Nru libpsl-0.20.2/src/psl-make-dafsa libpsl-0.21.0/src/psl-make-dafsa
--- libpsl-0.20.2/src/psl-make-dafsa	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/src/psl-make-dafsa	2019-04-16 13:10:17.000000000 +0000
@@ -222,7 +222,6 @@
 
 import sys
 import os.path
-import time
 import hashlib
 
 class InputError(Exception):
@@ -357,7 +356,7 @@
   nodemap = {frozenset((b'',)): None}
 
   def join(node):
-    """Returns a macthing node. A new node is created if no matching node
+    """Returns a matching node. A new node is created if no matching node
     exists. The graph is accessed in dfs order.
     """
     suffixes = frozenset(to_words(node))
@@ -565,7 +564,7 @@
       if section == 0:
         if b'===BEGIN ICANN DOMAINS===' in line:
           section = PSL_FLAG_ICANN
-        elif section == 0 and b'===BEGIN PRIVATE DOMAINS===' in line:
+        elif b'===BEGIN PRIVATE DOMAINS===' in line:
           section = PSL_FLAG_PRIVATE
       elif section == PSL_FLAG_ICANN and b'===END ICANN DOMAINS===' in line:
         section = 0
diff -Nru libpsl-0.20.2/tests/Makefile.am libpsl-0.21.0/tests/Makefile.am
--- libpsl-0.20.2/tests/Makefile.am	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/tests/Makefile.am	2019-04-16 13:10:17.000000000 +0000
@@ -1,4 +1,9 @@
-DEFS = @DEFS@ -DSRCDIR=\"$(srcdir)\" -DPSL_FILE=\"$(PSL_FILE)\" -DPSL_TESTFILE=\"$(PSL_TESTFILE)\"
+DEFS = @DEFS@ \
+       -DSRCDIR=\"$(srcdir)\" \
+       -DPSL_FILE=\"$(PSL_FILE)\" \
+       -DPSL_TESTFILE=\"$(PSL_TESTFILE)\" \
+       -DPSL_DAFSA=\"psl.dafsa\" \
+       -DPSL_ASCII_DAFSA=\"psl_ascii.dafsa\"
 AM_CPPFLAGS = -I$(top_srcdir)/include
 LDADD = ../src/libpsl.la
 AM_LDFLAGS = -no-install
@@ -28,9 +33,9 @@
 # dafsa.psl and dafsa_ascii.psl must be created before any test is executed
 # check-local target works in parallel to the tests, so the test suite will likely fail
 BUILT_SOURCES = psl.dafsa psl_ascii.dafsa
-psl.dafsa:
+psl.dafsa: $(top_srcdir)/list/public_suffix_list.dat
 	$(top_srcdir)/src/psl-make-dafsa --output-format=binary "$(PSL_FILE)" psl.dafsa
-psl_ascii.dafsa:
+psl_ascii.dafsa: $(top_srcdir)/list/public_suffix_list.dat
 	$(top_srcdir)/src/psl-make-dafsa --output-format=binary --encoding=ascii "$(PSL_FILE)" psl_ascii.dafsa
 
 clean-local:
diff -Nru libpsl-0.20.2/tests/meson.build libpsl-0.21.0/tests/meson.build
--- libpsl-0.20.2/tests/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/tests/meson.build	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,37 @@
+psl_dafsa = custom_target('psl.dafsa',
+  input : psl_file,
+  output : 'psl.dafsa',
+  command : [psl_make_dafsa, '--output-format=binary', '@INPUT@', '@OUTPUT@'])
+
+psl_ascii_dafsa = custom_target('psl_ascii.dafsa',
+  input : psl_file,
+  output : 'psl_ascii.dafsa',
+  command : [psl_make_dafsa, '--output-format=binary', '--encoding=ascii', '@INPUT@', '@OUTPUT@'])
+
+tests_cargs = [
+  '-DHAVE_CONFIG_H',
+  '-DSRCDIR="@0@"'.format(meson.current_source_dir()),
+  '-DPSL_FILE="@0@"'.format(psl_file),
+  '-DPSL_TESTFILE="@0@"'.format(psl_test_file),
+  '-DPSL_DAFSA="@0@"'.format(psl_dafsa.full_path()),
+  '-DPSL_ASCII_DAFSA="@0@"'.format(psl_ascii_dafsa.full_path()),
+]
+
+tests = [
+  'test-is-public',
+  'test-is-public-all',
+  'test-is-cookie-domain-acceptable',
+]
+
+if enable_builtin != 'no'
+  tests += ['test-is-public-builtin', 'test-registrable-domain']
+endif
+
+foreach test_name : tests
+  source = test_name + '.c'
+  exe = executable(test_name, source,
+    c_args : tests_cargs,
+    link_with : libpsl,
+    include_directories : [configinc, includedir])
+  test(test_name, exe, depends : [psl_dafsa, psl_ascii_dafsa])
+endforeach
diff -Nru libpsl-0.20.2/tests/test-is-public-all.c libpsl-0.21.0/tests/test-is-public-all.c
--- libpsl-0.20.2/tests/test-is-public-all.c	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/tests/test-is-public-all.c	2019-04-16 13:10:17.000000000 +0000
@@ -146,12 +146,12 @@
 	psl2 = psl_builtin();
 	printf("builtin PSL has %d suffixes and %d exceptions\n", psl_suffix_count(psl2), psl_suffix_exception_count(psl2));
 
-	if (!(psl3 = psl_load_file("psl.dafsa"))) {
+	if (!(psl3 = psl_load_file(PSL_DAFSA))) {
 		fprintf(stderr, "Failed to load 'psl.dafsa'\n");
 		failed++;
 	}
 
-	if (!(psl4 = psl_load_file("psl_ascii.dafsa"))) {
+	if (!(psl4 = psl_load_file(PSL_ASCII_DAFSA))) {
 		fprintf(stderr, "Failed to load 'psl_ascii.dafsa'\n");
 		failed++;
 	}
diff -Nru libpsl-0.20.2/tests/test-is-public-builtin.c libpsl-0.21.0/tests/test-is-public-builtin.c
--- libpsl-0.20.2/tests/test-is-public-builtin.c	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/tests/test-is-public-builtin.c	2019-04-16 13:10:17.000000000 +0000
@@ -69,7 +69,7 @@
 		{ "abc.www.ck", 0, 0 },
 		{ "xxx.ck", 1, 1 },
 		{ "www.xxx.ck", 0, 0 },
-		{ "\345\225\206\346\240\207", 1, 1 }, /* xn--czr694b oder ?? */
+		{ "\345\225\206\346\240\207", 1, 1 }, /* xn--czr694b or ?? */
 		{ "www.\345\225\206\346\240\207", 0, 0 },
 		{ "xn--czr694b", 1, 1 },
 		{ "www.xn--czr694b", 0, 0 },
@@ -125,7 +125,7 @@
 		}
 	}
 
-	printf("psl_builtin_file_time()=%ld\n", psl_builtin_file_time());
+	printf("psl_builtin_file_time()=%ld\n", (long) psl_builtin_file_time());
 	psl_builtin_file_time() == 0 ? failed++ : ok++;
 
 	printf("psl_builtin_sha1sum()=%s\n", psl_builtin_sha1sum());
diff -Nru libpsl-0.20.2/tools/Makefile.am libpsl-0.21.0/tools/Makefile.am
--- libpsl-0.20.2/tools/Makefile.am	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/tools/Makefile.am	2019-04-16 13:10:17.000000000 +0000
@@ -3,14 +3,4 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 LDADD = $(top_builddir)/src/libpsl.la
 
-#if WITH_LIBICU
-#  LDADD += -licuuc
-#endif
-#if WITH_LIBIDN2
-#  LDADD += -lidn2
-#endif
-#if WITH_LIBIDN
-#  LDADD += -lidn
-#endif
-
 dist_man_MANS = psl.1
diff -Nru libpsl-0.20.2/tools/meson.build libpsl-0.21.0/tools/meson.build
--- libpsl-0.20.2/tools/meson.build	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/tools/meson.build	2019-04-16 13:10:17.000000000 +0000
@@ -0,0 +1,4 @@
+psl = executable('psl', 'psl.c',
+  link_with : libpsl,
+  include_directories : [configinc, includedir],
+  c_args : ['-DHAVE_CONFIG_H'])
diff -Nru libpsl-0.20.2/tools/psl.c libpsl-0.21.0/tools/psl.c
--- libpsl-0.20.2/tools/psl.c	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/tools/psl.c	2019-04-16 13:10:17.000000000 +0000
@@ -60,6 +60,7 @@
 	fprintf(f, "  --print-unreg-domain         print the longest public suffix part\n");
 	fprintf(f, "  --print-reg-domain           print the shortest private suffix part\n");
 	fprintf(f, "  --print-info                 print info about library builtin data\n");
+	fprintf(f, "  -b,  --batch                 don't print leading domain\n");
 	fprintf(f, "\n");
 
 	exit(err);
@@ -77,7 +78,7 @@
 
 int main(int argc, const char *const *argv)
 {
-	int mode = 1, no_star_rule = 0;
+	int mode = 1, no_star_rule = 0, batch_mode = 0;
 	const char *const *arg, *psl_file = NULL, *cookie_domain = NULL;
 	psl_ctx_t *psl = (psl_ctx_t *) psl_latest(NULL);
 
@@ -85,7 +86,7 @@
 	setlocale(LC_ALL, "");
 
 	for (arg = argv + 1; arg < argv + argc; arg++) {
-		if (!strncmp(*arg, "--", 2)) {
+		if (**arg == '-') {
 			if (!strcmp(*arg, "--is-public-suffix"))
 				mode = 1;
 			else if (!strcmp(*arg, "--print-unreg-domain"))
@@ -130,6 +131,9 @@
 					psl_file = NULL;
 				}
 			}
+			else if (!strcmp(*arg, "--batch") || !strcmp(*arg, "-b")) {
+				batch_mode = 1;
+			}
 			else if (!strcmp(*arg, "--help")) {
 				fprintf(stdout, "`psl' explores the Public Suffix List\n\n");
 				usage(0, stdout);
@@ -175,30 +179,46 @@
 				for (len = strlen(domain); len && isspace(domain[len - 1]); len--); /* skip trailing spaces */
 				domain[len] = 0;
 
-				if ((rc = psl_str_to_utf8lower(domain, NULL, NULL, &lower)) != PSL_SUCCESS)
+				if ((rc = psl_str_to_utf8lower(domain, NULL, NULL, &lower)) != PSL_SUCCESS) {
 					fprintf(stderr, "%s: Failed to convert to lowercase UTF-8 (%d)\n", domain, rc);
-				else if (mode == 1) {
+					continue;
+				}
+
+				if (!batch_mode && mode != 4)
+					printf("%s: ", domain);
+
+				if (mode == 1) {
 					if (no_star_rule)
-						printf("%s: %d (%s)\n", domain, psl_is_public_suffix2(psl, lower, PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE), lower);
+						printf("%d", psl_is_public_suffix2(psl, lower, PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE));
 					else
-						printf("%s: %d (%s)\n", domain, psl_is_public_suffix(psl, lower), lower);
+						printf("%d", psl_is_public_suffix(psl, lower));
+
+					if (!batch_mode)
+						printf(" (%s)\n", lower);
+					else
+						putchar('\n');
+				}
+				else if (mode == 2) {
+					const char *dom = psl_unregistrable_domain(psl, lower);
+					printf("%s\n", dom ? dom : "(null)");
+				}
+				else if (mode == 3) {
+					const char *dom = psl_registrable_domain(psl, lower);
+					printf("%s\n", dom ? dom : "(null)");
 				}
-				else if (mode == 2)
-					printf("%s: %s\n", domain, psl_unregistrable_domain(psl, lower));
-				else if (mode == 3)
-					printf("%s: %s\n", domain, psl_registrable_domain(psl, lower));
 				else if (mode == 4) {
 					char *cookie_domain_lower;
 
 					if ((rc = psl_str_to_utf8lower(domain, NULL, NULL, &cookie_domain_lower)) == PSL_SUCCESS) {
-						printf("%s: %d\n", domain, psl_is_cookie_domain_acceptable(psl, lower, cookie_domain));
+						if (!batch_mode)
+							printf("%s: ", domain);
+						printf("%d\n", psl_is_cookie_domain_acceptable(psl, lower, cookie_domain));
 						free(cookie_domain_lower);
 					} else
 						fprintf(stderr, "%s: Failed to convert cookie domain '%s' to lowercase UTF-8 (%d)\n", domain, cookie_domain, rc);
 				}
 
-				if (rc == PSL_SUCCESS)
-					psl_free_string(lower);
+				psl_free_string(lower);
 			}
 
 			psl_free(psl);
@@ -208,23 +228,36 @@
 
 	if (mode == 1) {
 		for (; arg < argv + argc; arg++) {
+			if (!batch_mode)
+				printf("%s: ", *arg);
 			if (no_star_rule)
-				printf("%s: %d\n", *arg, psl_is_public_suffix2(psl, *arg, PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE));
+				printf("%d\n", psl_is_public_suffix2(psl, *arg, PSL_TYPE_ANY|PSL_TYPE_NO_STAR_RULE));
 			else
-				printf("%s: %d\n", *arg, psl_is_public_suffix(psl, *arg));
+				printf("%d\n", psl_is_public_suffix(psl, *arg));
 		}
 	}
 	else if (mode == 2) {
-		for (; arg < argv + argc; arg++)
-			printf("%s: %s\n", *arg, psl_unregistrable_domain(psl, *arg));
+		for (; arg < argv + argc; arg++) {
+			const char *dom = psl_unregistrable_domain(psl, *arg);
+			if (!batch_mode)
+				printf("%s: ", *arg);
+			printf("%s\n", dom ? dom : "(null)");
+		}
 	}
 	else if (mode == 3) {
-		for (; arg < argv + argc; arg++)
-			printf("%s: %s\n", *arg, psl_registrable_domain(psl, *arg));
+		for (; arg < argv + argc; arg++) {
+			const char *dom = psl_registrable_domain(psl, *arg);
+			if (!batch_mode)
+				printf("%s: ", *arg);
+			printf("%s\n", dom ? dom : "(null)");
+		}
 	}
 	else if (mode == 4) {
-		for (; arg < argv + argc; arg++)
-			printf("%s: %d\n", *arg, psl_is_cookie_domain_acceptable(psl, *arg, cookie_domain));
+		for (; arg < argv + argc; arg++) {
+			if (!batch_mode)
+				printf("%s: ", *arg);
+			printf("%d\n", psl_is_cookie_domain_acceptable(psl, *arg, cookie_domain));
+		}
 	}
 	else if (mode == 99) {
 		printf("dist filename: %s\n", psl_dist_filename());
@@ -257,7 +290,7 @@
 			printf("builtin exceptions: %d\n", psl_suffix_exception_count(psl));
 			printf("builtin wildcards: %d\n", psl_suffix_wildcard_count(psl));
 			printf("builtin filename: %s\n", psl_builtin_filename());
-			printf("builtin file time: %ld (%s)\n", psl_builtin_file_time(), time2str(psl_builtin_file_time()));
+			printf("builtin file time: %ld (%s)\n", (long) psl_builtin_file_time(), time2str(psl_builtin_file_time()));
 			printf("builtin SHA1 file hash: %s\n", psl_builtin_sha1sum());
 			printf("builtin outdated: %d\n", psl_builtin_outdated());
 		} else
diff -Nru libpsl-0.20.2/.travis.yml libpsl-0.21.0/.travis.yml
--- libpsl-0.20.2/.travis.yml	2018-04-26 18:18:39.000000000 +0000
+++ libpsl-0.21.0/.travis.yml	2019-04-16 13:10:17.000000000 +0000
@@ -38,6 +38,8 @@
       - valgrind
 
 script:
+  - set -e
+  - sed -i 's/dist-lzip//g' configure.ac
   - ./autogen.sh
 #  CFI doesn't work out on Ubuntu 14.04 (Trusty). They don't include LLVMgold.so for clang-3.8.
 #  clang-3.4 doesn't know CFI yet.