Merge pull request #839 from benjeffery/changelogs

Pre-release tasks

Author: mergify[bot]

c/CHANGELOG.rst

@@ -1,7 +1,12 @@
 ---------------------
-[0.99.6] - 2020-XX-XX
+[0.99.6] - 2020-09-04
 ---------------------
 
+**Bugfixes**
+
+- :issue:`823` - Fix mutation time error when using
+  ``tsk_table_collection_simplify`` with ``TSK_KEEP_INPUT_ROOTS``
+  (:user:`petrelharp`, :pr:`823`).
 
 ---------------------
 [0.99.5] - 2020-08-27

python/CHANGELOG.rst

@@ -1,7 +1,14 @@
 --------------------
-[0.X.X] - 2020-XX-XX
+[0.3.1] - 2020-09-04
 --------------------
 
+**Bugfixes**
+
+- :issue:`823` - Fix mutation time error when using
+  ``simplify(keep_input_roots=True)`` (:user:`petrelharp`, :pr:`823`).
+
+- :issue:`821` - Fix mutation rows with unknown time never being
+  equal (:user:`petrelharp`, :pr:`822`).
 
 --------------------
 [0.3.0] - 2020-08-27

python/tskit/_version.py

@@ -1,4 +1,4 @@
 # Definitive location for the version number.
 # During development, should be x.y.z.devN
 # For beta should be x.y.zbN
-tskit_version = "0.3.1.dev1"
+tskit_version = "0.3.1"