Fix bugs

psiphon/common/values/values.go

@@ -55,7 +55,10 @@ type PartSpec struct {
 // NewPickOneSpec creates a simple spec to select one item from a list as a
 // value.
 func NewPickOneSpec(items []string) *ValueSpec {
-	return &ValueSpec{Parts: []PartSpec{{Items: items, MinCount: 1, MaxCount: 1}}}
+	return &ValueSpec{
+		Probability: 1.0,
+		Parts:       []PartSpec{{Items: items, MinCount: 1, MaxCount: 1}},
+	}
 }
 
 // GetValue selects a value according to the spec. An optional seed may

psiphon/server/meek.go

@@ -791,7 +791,7 @@ func (server *MeekServer) getSessionOrEndpoint(
 		sessionIDSent:       false,
 		cachedResponse:      cachedResponse,
 		cookieName:          meekCookie.Name,
-		contentType:         r.Header.Get("Content-Type"),
+		contentType:         request.Header.Get("Content-Type"),
 	}
 
 	session.touch()

psiphon/server/server_test.go

@@ -1670,7 +1670,7 @@ func checkExpectedServerTunnelLogFields(
 	}
 
 	if !common.Contains(testSSHClientVersions, fields["ssh_client_version"].(string)) {
-		return fmt.Errorf("unexpected relay_protocol '%s'", fields["ssh_client_version"])
+		return fmt.Errorf("unexpected ssh_client_version '%s'", fields["ssh_client_version"])
 	}
 
 	clientFeatures := fields["client_features"].([]interface{})