From 23dbb6ba72c9c5cce6f703d44dc6eaed2005c982 Mon Sep 17 00:00:00 2001
From: Matthijs Mekking <matthijs@isc.org>
Date: Mon, 1 May 2023 15:04:42 +0200
Subject: [PATCH] Add release note and changes for #3950

Fixing another serve-stale bug is still news.
---
 CHANGES                     | 3 +++
 doc/notes/notes-current.rst | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 15acb8bdfc..52b4cf5e4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6183.	[bug]		Fix a serve-stale bug where a delegation from cache
+			could be returned to the client. [GL #3950]
+
 6182.	[cleanup]	Remove configure checks for epoll, kqueue and
 			/dev/poll. [GL #4098]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 53a5e83a96..b5ba7b17e7 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -51,6 +51,10 @@ Bug Fixes
 
 - None.
 
+- It could happen that after the :any:`stale-answer-client-timeout` duration,
+  a delegation from cache was returned to the client. This has now been fixed.
+  :gl:`#3950`
+
 Known Issues
 ~~~~~~~~~~~~