From 65c7ea2e019f14e5e9eb9ae9a41c26b8496ea025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
Date: Thu, 16 Jan 2020 18:59:34 +0100
Subject: [PATCH] changelog: Assemble changes for release 20.1.1

---
 .changelog/2558.bugfix.md  | 1 -
 .changelog/2559.trivial.md | 1 -
 CHANGELOG.md               | 8 ++++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 .changelog/2558.bugfix.md
 delete mode 100644 .changelog/2559.trivial.md

diff --git a/.changelog/2558.bugfix.md b/.changelog/2558.bugfix.md
deleted file mode 100644
index ac7c3ace079..00000000000
--- a/.changelog/2558.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Don't allow duplicate P2P connections from the same IP by default.
diff --git a/.changelog/2559.trivial.md b/.changelog/2559.trivial.md
deleted file mode 100644
index b4a6dfbdde9..00000000000
--- a/.changelog/2559.trivial.md
+++ /dev/null
@@ -1 +0,0 @@
-Release tooling improvements
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d348d9fe4f..848738bd32b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,14 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 20.1.1 (2020-01-16)
+
+### Bug Fixes
+
+- Don't allow duplicate P2P connections from the same IP by default.
+  ([#2558](https://github.com/oasislabs/oasis-core/issues/2558))
+
+
 ## 20.1 (2020-01-14)
 
 ### Features