From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 8 Dec 2020 17:57:35 +0000 (+0100)
Subject: release 5.2.1
X-Git-Tag: v5.2.1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fobs-knot-resolver-bs4hbr%2Fdeployments%2F1294;p=thirdparty%2Fknot-resolver.git

release 5.2.1
---

diff --git a/AUTHORS b/AUTHORS
index cb38df574..af09c267c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Alex Forster <aforster@cloudflare.com>
 Ali Asad Lotia <ali.asad.lotia@gmail.com>
 Anbang Wen <anbang@cloudflare.com>
 Andreas Rammhold <andreas@rammhold.de>
+Christophe Nowicki <cscm@csquad.org>
 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 Daniel Salzman <daniel.salzman@nic.cz>
 daurnimator <quae@daurnimator.com>
diff --git a/NEWS b/NEWS
index b0d4ed670..e2145efed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,15 @@
-Knot Resolver X.Y.X (yyyy-mm-dd)
+Knot Resolver 5.2.1 (2020-12-09)
 ================================
 
+Improvements
+------------
+- doh2: send Cache-Control header with TTL (#617, !1095)
+
 Bugfixes
 --------
 - fix map() command on 32-bit platforms; regressed in 5.2.0 (!1093)
 - doh2: restrict endpoints to doh and dns-query (#636, !1104)
+- renumber: map to correct subnet when using multiple rules (!1107)
 
 
 Knot Resolver 5.2.0 (2020-11-11)
diff --git a/meson.build b/meson.build
index da5e34858..9c026302c 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project(
   'knot-resolver',
   ['c', 'cpp'],
   license: 'GPLv3+',
-  version: '5.2.0',
+  version: '5.2.1',
   default_options: ['c_std=gnu11', 'b_ndebug=if-release'],
   meson_version: '>=0.49',
 )