Merge branch 'fixwin' of git://github.com/boypt/v2ray-core into boypt-fixwin

infra/conf/command/command.go

@@ -3,6 +3,7 @@ package command
 //go:generate errorgen
 
 import (
+	"bufio"
 	"os"
 
 	"github.com/golang/protobuf/proto"
@@ -27,7 +28,7 @@ func (c *ConfigCommand) Description() control.Description {
 }
 
 func (c *ConfigCommand) Execute(args []string) error {
-	pbConfig, err := serial.LoadJSONConfig(os.Stdin)
+	pbConfig, err := serial.LoadJSONConfig(bufio.NewReader(os.Stdin))
 	if err != nil {
 		return newError("failed to parse json config").Base(err)
 	}