From db817f95272371e6d9c1ac54204e6eac5edeec5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
Date: Fri, 23 Apr 2021 13:52:10 +0200
Subject: [PATCH] changelog: Assemble changes for 20.12.7 release

---
 .changelog/3755.bugfix.md   |  1 -
 .changelog/3873.bugfix.md   |  1 -
 .changelog/3877.internal.md |  1 -
 CHANGELOG.md                | 21 +++++++++++++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 delete mode 100644 .changelog/3755.bugfix.md
 delete mode 100644 .changelog/3873.bugfix.md
 delete mode 100644 .changelog/3877.internal.md

diff --git a/.changelog/3755.bugfix.md b/.changelog/3755.bugfix.md
deleted file mode 100644
index 432d3ea9b0c..00000000000
--- a/.changelog/3755.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-go/consensus: Move upgrade logic to governance, gracefully handle halt
diff --git a/.changelog/3873.bugfix.md b/.changelog/3873.bugfix.md
deleted file mode 100644
index 1a19955627d..00000000000
--- a/.changelog/3873.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-go/oasis-node: Dump correct block height on halt
diff --git a/.changelog/3877.internal.md b/.changelog/3877.internal.md
deleted file mode 100644
index 68a4bb57c51..00000000000
--- a/.changelog/3877.internal.md
+++ /dev/null
@@ -1 +0,0 @@
-go: Ignore jwt-go vulns since we're not using the features
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a940d41bc3..9167665d1af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,27 @@ The format is inspired by [Keep a Changelog].
 
 <!-- TOWNCRIER -->
 
+## 20.12.7 (2021-04-23)
+
+| Protocol          | Version   |
+|:------------------|:---------:|
+| Consensus         | 2.0.0     |
+| Runtime Host      | 1.0.0     |
+| Runtime Committee | 1.0.0     |
+
+### Bug Fixes
+
+- go/consensus: Gracefully handle halt
+  ([#3755](https://github.com/oasisprotocol/oasis-core/issues/3755))
+
+- go/oasis-node: Dump correct block height on halt
+  ([#3873](https://github.com/oasisprotocol/oasis-core/issues/3873))
+
+### Internal Changes
+
+- go: Ignore jwt-go vulnerabilities since we're not using the features
+  ([#3877](https://github.com/oasisprotocol/oasis-core/issues/3877))
+
 ## 20.12.6 (2021-04-12)
 
 | Protocol          | Version   |