From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Thu, 30 Jan 2020 15:04:27 +0000 (+0100)
Subject: - Add changelog entry for RPZ merge
X-Git-Tag: release-1.10.0rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c459443da307f4b4cdb233a2bcee3cc3a3eae72;p=thirdparty%2Funbound.git

- Add changelog entry for RPZ merge
---

diff --git a/doc/Changelog b/doc/Changelog
index 932595208..1b78c8d6d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,8 @@
 	- Fix memory leak in error condition remote.c
 	- Fix double free in error condition view.c
 	- Fix memory leak in do_auth_zone_transfer on success
+	- Merge RPZ support into master. Only QNAME and Response IP triggers are
+	  supported.
 
 30 January 2020: Wouter
 	- Fix subnet tests for disabled DSA algorithm by default.