5 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/4613.feature b/changelog.d/4613.feature
new file mode 100644
index 0000000000..098f906af2
--- /dev/null
+++ b/changelog.d/4613.feature
@@ -0,0 +1 @@
+There is no longer any need to specify `no_tls`: it is inferred from the absence of TLS listeners
diff --git a/changelog.d/4615.feature b/changelog.d/4615.feature
new file mode 100644
index 0000000000..098f906af2
--- /dev/null
+++ b/changelog.d/4615.feature
@@ -0,0 +1 @@
+There is no longer any need to specify `no_tls`: it is inferred from the absence of TLS listeners
diff --git a/changelog.d/4615.misc b/changelog.d/4615.misc
deleted file mode 100644
index c7266fcfc7..0000000000
--- a/changelog.d/4615.misc
+++ /dev/null
@@ -1 +0,0 @@
-Logging improvements around TLS certs
diff --git a/changelog.d/4617.feature b/changelog.d/4617.feature
new file mode 100644
index 0000000000..098f906af2
--- /dev/null
+++ b/changelog.d/4617.feature
@@ -0,0 +1 @@
+There is no longer any need to specify `no_tls`: it is inferred from the absence of TLS listeners
diff --git a/changelog.d/4617.misc b/changelog.d/4617.misc
deleted file mode 100644
index 6d751865c9..0000000000
--- a/changelog.d/4617.misc
+++ /dev/null
@@ -1 +0,0 @@
-Don't create server contexts when TLS is disabled