Merge branch 'master' into dev

This commit is contained in:
nadoo 2021-11-28 23:17:10 +08:00
commit 63caac133d

View File

@ -84,6 +84,7 @@ func (s *Trojan) Serve(c net.Conn) {
if s.withTLS {
tlsConn := tls.Server(c, s.tlsConfig)
defer tlsConn.Close()
err := tlsConn.Handshake()
if err != nil {
log.F("[trojan] error in tls handshake: %s", err)