Merge tag 'v0.21.22'

release v0.21.22

test/meson.build

@@ -24,6 +24,7 @@ gtest_dep = declare_dependency(
 )
 
 subdir('net')
+subdir('time')
 
 executable(
   'read_conf',
@@ -52,19 +53,6 @@ test('TestUtil', executable(
   ],
 ))
 
-test(
-  'TestTime',
-  executable(
-    'TestTime',
-    'TestISO8601.cxx',
-    include_directories: inc,
-    dependencies: [
-      time_dep,
-      gtest_dep,
-    ],
-  ),
-)
-
 test('TestRewindInputStream', executable(
   'TestRewindInputStream',
   'TestRewindInputStream.cxx',
@@ -326,6 +314,11 @@ if curl_dep.found()
     include_directories: inc,
     dependencies: [
       curl_dep,
+
+      # Explicitly linking with zlib here works around a linker
+      # failure on Windows, because our Windows CURL build is
+      # statically linked and thus declares no dependency on zlib
+      zlib_dep,
     ],
   )