Merge branch 'features/makedist-persist-windir'

diff --cc doc/Changelog
index 8359f08f5a1d8321055e832e5c93b9f171c19c41,6651612d88b08ddc830d6abbf95f78afdbc93ce4..69d80fda34162d69d9dc8892c60d48534e210c34
--- 1/doc/Changelog
--- 2/doc/Changelog
+++ b/doc/Changelog
@@@ -1,7 -1,3 +1,11 @@@
++15 March 2024: Yorgos
++      - Merge #1030: Persist the openssl and expat directories for repeated
++        Windows builds.
++
 +15 March 2024: Wouter
 +      - Fix that addrinfo is not kept around but copied and freed, so that
 +        log-destaddr uses a copy of the information, much like NSD does.
 +
  13 March 2024: Wouter
        - Fix #1029: rpz trigger clientip and action rpz-passthru not working
          as expected.