Conflicts: src/frp/cmd/frpc/control.go src/frp/cmd/frps/control.go src/frp/models/config/config.go src/frp/models/server/server.go
add support for https
cmd/frps: fix a bug when vhost_http_port is not set, fix #30
modified: src/frp/models/server/server.go modified: src/frp/utils/conn/conn.go modified: src/frp/utils/pcrypto/pcrypto.go modified: src/frp/utils/pcrypto/pcrypto_test.go