Merge branch 'master' into spec-v0.12

lighthouse/environment/Cargo.toml

@@ -21,3 +21,4 @@ slog-json = "2.3.0"
 exit-future = "0.2.0"
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
+discv5 = "0.1.0-alpha.5"

lighthouse/environment/src/executor.rs

@@ -126,3 +126,9 @@ impl TaskExecutor {
         &self.log
     }
 }
+
+impl discv5::Executor for TaskExecutor {
+    fn spawn(&self, future: std::pin::Pin<Box<dyn Future<Output = ()> + Send>>) {
+        self.spawn(future, "discv5")
+    }
+}