Always include the country code and drop include_probe_cc setting

Fixes: https://github.com/ooni/probe/issues/1183

internal/cli/onboard/onboard.go

@@ -76,13 +76,11 @@ func Onboarding(config *config.Config) error {
 	settings := struct {
 		IncludeIP        bool
 		IncludeNetwork   bool
-		IncludeCountry   bool
 		UploadResults    bool
 		SendCrashReports bool
 	}{}
 	settings.IncludeIP = false
 	settings.IncludeNetwork = true
-	settings.IncludeCountry = true
 	settings.UploadResults = true
 	settings.SendCrashReports = true
 
@@ -99,13 +97,6 @@ func Onboarding(config *config.Config) error {
 					Default: true,
 				},
 			},
-			{
-				Name: "IncludeCountry",
-				Prompt: &survey.Confirm{
-					Message: "Can we include your country name?",
-					Default: true,
-				},
-			},
 			{
 				Name: "UploadResults",
 				Prompt: &survey.Confirm{
@@ -131,7 +122,6 @@ func Onboarding(config *config.Config) error {
 
 	config.Lock()
 	config.InformedConsent = true
-	config.Sharing.IncludeCountry = settings.IncludeCountry
 	config.Advanced.SendCrashReports = settings.SendCrashReports
 	config.Sharing.IncludeIP = settings.IncludeIP
 	config.Sharing.IncludeASN = settings.IncludeNetwork

internal/cli/run/run.go

@@ -116,7 +116,8 @@ func init() {
 		// Make sure we share what the user wants us to share.
 		ctx.Session.SetIncludeProbeIP(ctx.Config.Sharing.IncludeIP)
 		ctx.Session.SetIncludeProbeASN(ctx.Config.Sharing.IncludeASN)
-		ctx.Session.SetIncludeProbeCC(ctx.Config.Sharing.IncludeCountry)
+		// Always include probe_cc
+		ctx.Session.SetIncludeProbeCC(true)
 		return nil
 	})