Fix: post-merge fixes

* Added tls_resumed_session and quic_resumed_session to the
  set of packed API parameters

go.mod

@@ -94,12 +94,12 @@ require (
 	filippo.io/keygen v0.0.0-20230306160926-5201437acf8e // indirect
 	github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
 	github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 // indirect
-	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/bits-and-blooms/bitset v1.10.0 // indirect
+	github.com/cloudflare/circl v1.3.7 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/siphash v1.2.3 // indirect
 	github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
-	github.com/gaukas/godicttls v0.0.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect

psiphon/common/protocol/packed.go

@@ -792,6 +792,9 @@ func init() {
 
 		{142, "statusData", rawJSONConverter},
 
+		{143, "tls_resumed_session", intConverter},
+		{144, "quic_resumed_session", intConverter},
+
 		// Last key value = 142
 	}
 

psiphon/common/quic/quic.go

@@ -703,7 +703,11 @@ func (conn *Conn) GetMetrics() common.LogFields {
 		logFields.Add(underlyingMetrics.GetMetrics())
 	}
 
-	logFields["quic_resumed_session"] = conn.connection.hasResumedSession()
+	quicResumedSession := "0"
+	if conn.connection.hasResumedSession() {
+		quicResumedSession = "1"
+	}
+	logFields["quic_resumed_session"] = quicResumedSession
 
 	return logFields
 }

psiphon/dialParameters_test.go

@@ -567,7 +567,7 @@ func runDialParametersAndReplay(t *testing.T, tunnelProtocol string) {
 	}
 
 	dialParams, err = MakeDialParameters(
-		clientConfig, steeringIPCache, nil, canReplay, selectProtocol, serverEntries[0], nil, nil, false, 0, 0)
+		clientConfig, steeringIPCache, nil, nil, nil, canReplay, selectProtocol, serverEntries[0], nil, nil, false, 0, 0)
 
 	if protocol.TunnelProtocolIsDirect(tunnelProtocol) {
 		if err == nil {

psiphon/server/api.go

@@ -1117,6 +1117,8 @@ var baseDialParams = []requestParamSpec{
 	{"tls_ossh_sni_server_name", isDomain, requestParamOptional},
 	{"tls_ossh_transformed_host_name", isBooleanFlag, requestParamOptional | requestParamLogFlagAsBool},
 	{"steering_ip", isIPAddress, requestParamOptional | requestParamLogOnlyForFrontedMeekOrConjure},
+	{"tls_resumed_session", isBooleanFlag, requestParamOptional | requestParamLogFlagAsBool},
+	{"quic_resumed_session", isBooleanFlag, requestParamOptional | requestParamLogFlagAsBool},
 }
 
 var inproxyDialParams = []requestParamSpec{

psiphon/tlsDialer.go

@@ -688,7 +688,7 @@ func CustomTLSDial(
 		Conn:           conn,
 		underlyingConn: underlyingConn,
 		resumedSession: usedSessionTicket,
-		}, nil
+	}, nil
 }
 
 type tlsConn struct {
@@ -706,7 +706,12 @@ func (conn *tlsConn) GetMetrics() common.LogFields {
 	if ok {
 		logFields.Add(underlyingMetrics.GetMetrics())
 	}
-	logFields["tls_resumed_session"] = conn.resumedSession
+
+	resumedSession := "0"
+	if conn.resumedSession {
+		resumedSession = "1"
+	}
+	logFields["tls_resumed_session"] = resumedSession
 
 	return logFields
 }

vendor/github.com/pelletier/go-toml/example-crlf.toml

@@ -1,30 +1,30 @@
-# This is a TOML document. Boom.
-
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-organization = "GitHub"
-bio = "GitHub Cofounder & CEO\nLikes tater tots and beer."
-dob = 1979-05-27T07:32:00Z # First class dates? Why not?
-
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-
-[servers]
-
-  # You can indent as you please. Tabs or spaces. TOML don't care.
-  [servers.alpha]
-  ip = "10.0.0.1"
-  dc = "eqdc10"
-
-  [servers.beta]
-  ip = "10.0.0.2"
-  dc = "eqdc10"
-
-[clients]
-data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it
+# This is a TOML document. Boom.
+
+title = "TOML Example"
+
+[owner]
+name = "Tom Preston-Werner"
+organization = "GitHub"
+bio = "GitHub Cofounder & CEO\nLikes tater tots and beer."
+dob = 1979-05-27T07:32:00Z # First class dates? Why not?
+
+[database]
+server = "192.168.1.1"
+ports = [ 8001, 8001, 8002 ]
+connection_max = 5000
+enabled = true
+
+[servers]
+
+  # You can indent as you please. Tabs or spaces. TOML don't care.
+  [servers.alpha]
+  ip = "10.0.0.1"
+  dc = "eqdc10"
+
+  [servers.beta]
+  ip = "10.0.0.2"
+  dc = "eqdc10"
+
+[clients]
+data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it
 score = 4e-08 # to make sure leading zeroes in exponent parts of floats are supported