Merge branch 'master' into feat/logs

# Conflicts:
#	src/chainstate/stacks/db/mod.rs
#	src/chainstate/stacks/db/transactions.rs

Cargo.lock

@@ -270,7 +270,7 @@ dependencies = [
  "slog-json",
  "slog-term",
  "stx-genesis",
- "time 0.2.16",
+ "time 0.2.23",
  "tini",
  "url",
 ]
@@ -414,6 +414,12 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "const_fn"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -2513,11 +2519,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.16"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15"
+checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b"
 dependencies = [
- "cfg-if 0.1.10",
+ "const_fn",
  "libc",
  "standback",
  "stdweb",