Merge branch 'update_riseup_defaults' into 'master'

Riseup changes

See merge request leap/bitmask_android!240

app/build.gradle

@@ -131,12 +131,12 @@ android {
       def customProviderUrl = '"https://black.riseup.net"'
       buildConfigField "String", "customProviderUrl", customProviderUrl
       //static ip address of provider, using a commercially validated CA certificate to serve the provider.json
-      def customProviderIp = '"198.252.153.70"'
+      def customProviderIp = '""'
       buildConfigField "String", "customProviderIp", customProviderIp
       //static ip address of the provider api, using a self signed certificate to serve provider.json, eip-service.json etc.
-      def customProviderApiIp = '"198.252.153.107"'
+      def customProviderApiIp = '""'
       buildConfigField "String", "customProviderApiIp", customProviderApiIp
-      def geoipUrl = '"https://api.black.riseup.net:9001/json"'
+      def geoipUrl = '"https://menshen.riseup.net/json"'
       buildConfigField "String", "geoipUrl", geoipUrl
       //URL for the message of the day, see https://0xacab.org/leap/motd#motd-message-of-the-day
       def customProviderMotdUrl = '"https://static.riseup.net/vpn/motd.json"'

app/src/normal/assets/urls/riseup.net.url

 {
 	"main_url" : "https://black.riseup.net",
-	"provider_ip" : "198.252.153.70",
-	"provider_api_ip" : "198.252.153.107",
-	"geoip_url" : "https://api.black.riseup.net:9001/json",
+	"geoip_url" : "https://menshen.riseup.net/json",
 	"motd_url": "https://static.riseup.net/vpn/motd.json"
 }