Merge branch 'master' of https://github.com/Psiphon-Labs/psiphon-tunnel-core

psiphon/TCPConn.go

@@ -211,3 +211,21 @@ func (conn *TCPConn) Close() (err error) {
 
 	return err
 }
+
+// CloseWrite calls net.TCPConn.CloseWrite when the underlying
+// conn is a *net.TCPConn.
+func (conn *TCPConn) CloseWrite() (err error) {
+	conn.mutex.Lock()
+	defer conn.mutex.Unlock()
+
+	if conn.isClosed {
+		return errors.New("already closed")
+	}
+
+	tcpConn, ok := conn.Conn.(*net.TCPConn)
+	if !ok {
+		return errors.New("conn is not a *net.TCPConn")
+	}
+
+	return tcpConn.CloseWrite()
+}