Merge branch 'master' into test_vapore_status

diff --cc node/node.go
index 666392e,8469de7..bf4e60b
--- 1/node/node.go
--- 2/node/node.go
+++ b/node/node.go
@@@ -1,10 -1,8 +1,9 @@@
  package node
  
  import (
-       "context"
        "encoding/hex"
        "errors"
 +      "fmt"
        "net"
        "net/http"
        _ "net/http/pprof"