From: Yorgos Thessalonikefs <yorgos@nlnetlabs.nl>
Date: Fri, 15 Mar 2024 16:20:22 +0000 (+0100)
Subject: Merge branch 'features/makedist-persist-windir'
X-Git-Tag: release-1.20.0rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792089f523732418076bbdb4c7ca2bd911e81984;p=thirdparty%2Funbound.git

Merge branch 'features/makedist-persist-windir'
---

792089f523732418076bbdb4c7ca2bd911e81984
diff --cc doc/Changelog
index 8359f08f5,6651612d8..69d80fda3
--- a/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.