Move include_country to the sharing options

config/parser_test.go

@@ -13,7 +13,7 @@ func TestParseConfig(t *testing.T) {
 	if len(config.NettestGroups.Middlebox.EnabledTests) < 0 {
 		t.Error("at least one middlebox test should be enabled")
 	}
-	if config.Advanced.IncludeCountry == false {
+	if config.Sharing.IncludeCountry == false {
 		t.Error("country should be included")
 	}
 }

config/settings.go

@@ -110,15 +110,15 @@ type Notifications struct {
 
 // Sharing settings
 type Sharing struct {
-	IncludeIP     bool `json:"include_ip"`
-	IncludeASN    bool `json:"include_asn"`
-	IncludeGPS    bool `json:"include_gps"`
-	UploadResults bool `json:"upload_results"`
+	IncludeIP      bool `json:"include_ip"`
+	IncludeASN     bool `json:"include_asn"`
+	IncludeCountry bool `json:"include_country"`
+	IncludeGPS     bool `json:"include_gps"`
+	UploadResults  bool `json:"upload_results"`
 }
 
 // Advanced settings
 type Advanced struct {
-	IncludeCountry    bool `json:"include_country"`
 	UseDomainFronting bool `json:"use_domain_fronting"`
 	SendCrashReports  bool `json:"send_crash_reports"`
 }

config/testdata/valid-config.json

@@ -5,6 +5,7 @@
   "auto_update": true,
   "sharing": {
     "include_ip": false,
+    "include_country": true,
     "include_asn": true,
     "include_gps": true,
     "upload_results": true
@@ -56,7 +57,6 @@
     }
   },
   "advanced": {
-    "include_country": true,
     "use_domain_fronting": false,
     "send_crash_reports": true
   }