resolving conflict

- Manually resolved conflict from naming convention and updated functionality.
- WIP: Some tests must be redesigned
- WIP: Support TLS 1.3

examples/examples.go

@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/refraction-networking/utls"
+	tls "github.com/refraction-networking/utls"
 	"golang.org/x/net/http2"
 )
 
@@ -304,6 +304,8 @@ func forgeConn() {
 	clientUtls.SetUnderlyingConn(clientConn)
 
 	hs := clientUtls.HandshakeState
+
+	// TODO: Redesign this part to use TLS 1.3
 	serverTls := tls.MakeConnWithCompleteHandshake(serverConn, hs.ServerHello.Vers, hs.ServerHello.CipherSuite,
 		hs.MasterSecret, hs.Hello.Random, hs.ServerHello.Random, false)
 
@@ -322,6 +324,7 @@ func forgeConn() {
 
 	buf := make([]byte, 13)
 	read, err := serverTls.Read(buf)
+
 	if err != nil {
 		fmt.Printf("error reading server: %+v\n", err)
 	}