Update version and Changelog for 0.9.3 (#739)

Cargo.lock

@@ -779,7 +779,7 @@ dependencies = [
 
 [[package]]
 name = "krill"
-version = "0.9.3-rc3"
+version = "0.9.3"
 dependencies = [
  "base64 0.13.0",
  "basic-cookies",

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 # Note: some of these values are also used when building Debian packages below.
 name    = "krill"
-version = "0.9.3-rc3"
+version = "0.9.3"
 edition = "2018"
 authors = [ "The NLnet Labs RPKI team <rpki-team@nlnetlabs.nl>" ]
 description = "Resource Public Key Infrastructure (RPKI) daemon"

Changelog.md

@@ -1,16 +1,7 @@
 # Change Log
 
-<<<<<<< HEAD
-## 0.9.3 (RC3) 'The Thundering Herd'
+## 0.9.3 'The Thundering Herd'
 
-RC3 fixes the following issues in RC2:
-- Use the, now official, ASPA OID (#700)
-- Re-issue ASPA objects on key rolls (717)
-
-=======
-## 0.9.3 (RC2) 'The Thundering Herd'
-
->>>>>>> main
 This release adds the following features and fixes:
 - Prevent a thundering herd of hosted CAs publishing at the same time (#692) 
 - Re-issue ROAs to ensure that short EE subject names are used (#700)
@@ -26,7 +17,6 @@ https://krill.docs.nlnetlabs.nl/en/prototype-aspa-support/manage-aspas.html
 The full list of changes can be found here:
 https://github.com/NLnetLabs/krill/projects/18
 
-
 ## 0.9.2 'Motive and Opportunity'
 
 This release includes two features aimed at users who run a Krill CA to maintain ROAs: