Merge remote-tracking branch 'origin/dev' into ios-wireguard

client/android/build.gradle

@@ -102,8 +102,8 @@ android {
         resConfig "en"
         minSdkVersion = 24
         targetSdkVersion = 30
-        versionCode 6 // Change to a higher number
-        versionName "2.0.6" // Change to a higher number
+        versionCode 7 // Change to a higher number
+        versionName "2.0.7" // Change to a higher number
     }
 
    buildTypes {

client/defines.h

@@ -4,7 +4,7 @@
 #define APPLICATION_NAME    "AmneziaVPN"
 #define SERVICE_NAME        "AmneziaVPN-service"
 #define ORGANIZATION_NAME   "AmneziaVPN.ORG"
-#define APP_MAJOR_VERSION   "2.0.6"
-#define APP_VERSION         "2.0.6.0"
+#define APP_MAJOR_VERSION   "2.0.7"
+#define APP_VERSION         "2.0.7.0"
 
 #endif // DEFINES_H

client/server_scripts/dns/Dockerfile

@@ -1,3 +1,48 @@
 FROM mvance/unbound:latest
 
 LABEL maintainer="AmneziaVPN" 
+
+RUN echo " \n\
+domain-insecure: \"coin.\"\n\
+domain-insecure: \"emc.\"\n\
+domain-insecure: \"lib.\"\n\
+domain-insecure: \"bazar.\"\n\
+domain-insecure: \"enum.\"\n\
+\n\
+stub-zone:\n\
+   name: coin.\n\
+   stub-host: seed1.emercoin.com\n\
+   stub-host: seed2.emercoin.com\n\
+   stub-first: yes\n\
+\n\
+stub-zone:\n\
+   name: emc.\n\
+   stub-host: seed1.emercoin.com\n\
+   stub-host: seed2.emercoin.com\n\
+   stub-first: yes\n\
+\n\
+stub-zone:\n\
+   name: lib.\n\
+   stub-host: seed1.emercoin.com\n\
+   stub-host: seed2.emercoin.com\n\
+   stub-first: yes\n\
+\n\
+stub-zone:\n\
+   name: bazar.\n\
+   stub-host: seed1.emercoin.com\n\
+   stub-host: seed2.emercoin.com\n\
+   stub-first: yes\n\
+\n\
+stub-zone:\n\
+   name: enum.\n\
+   stub-host: seed1.emercoin.com\n\
+   stub-host: seed2.emercoin.com\n\
+   stub-first: yes\n\
+\n\
+forward-zone:\n\
+   name: .\n\
+   forward-tls-upstream: yes\n\
+   forward-addr: 1.1.1.1@853  #cloudflare-dns.com\n\
+   forward-addr: 1.0.0.1@853  #cloudflare-dns.com\n\
+" | tee /opt/unbound/etc/unbound/forward-records.conf
+