From f8882de9d1f2b8f05da0af1084693d6e6ba753e2 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 23 Dec 2016 18:48:38 +0000
Subject: [PATCH] Update changelog

---
 debian/changelog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b0036db8d..3e7c3e917 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ ikiwiki (3.20141016.4) UNRELEASED; urgency=medium
 
   [ Simon McVittie ]
   * Add CVE-2016-4561 reference to 3.20141016.3 changelog
+  * Security: tell `git revert` not to follow renames. If it does, then
+    renaming a file can result in a revert writing outside the wiki srcdir
+    or altering a file that the reverting user should not be able to alter,
+    an authorization bypass. Thanks, intrigeri. (CVE-2016-10026)
 
  -- Simon McVittie <smcv@debian.org>  Mon, 09 May 2016 22:35:16 +0100
 
-- 
2.39.2