Merge from remote branch

2022-02-23 01:00:27 +08:00
parent 3b2ec3d880 03e4b5d525
commit b192238699
79 changed files with 1071 additions and 542 deletions
--- a/component/geodata/memconservative/cache.go
+++ b/component/geodata/memconservative/cache.go
@ -8,6 +8,7 @@ import (
 	"github.com/Dreamacro/clash/component/geodata/router"
 	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
+
 	"google.golang.org/protobuf/proto"
 )

--- a/component/geodata/standard/standard.go
+++ b/component/geodata/standard/standard.go
@ -9,6 +9,7 @@ import (
 	"github.com/Dreamacro/clash/component/geodata"
 	"github.com/Dreamacro/clash/component/geodata/router"
 	C "github.com/Dreamacro/clash/constant"
+
 	"google.golang.org/protobuf/proto"
 )