diff --git a/README.md b/README.md
index ca00dafc..bd99e7e7 100644
--- a/README.md
+++ b/README.md
@@ -9,12 +9,12 @@ The dnscrypt-proxy software is written and maintained by Frank Denis (@jedisct1)
Missing features:
-- Secondary resolver support (soon available) - see [#3](https://github.com/bitbeans/SimpleDnsCrypt/issues/3)
+- Secondary resolver support (soon available) - see [#3](https://github.com/bitbeans/SimpleDnsCrypt/issues/3) and https://github.com/jedisct1/dnscrypt-proxy/issues/418
- IPv6 support - see [#1](https://github.com/bitbeans/SimpleDnsCrypt/issues/1)
### Installation
-To install Simple DNSCrypt use the [latest MSI package](https://github.com/bitbeans/SimpleDnsCrypt/releases/download/0.3.2/SimpleDNSCrypt.msi).
+To install Simple DNSCrypt use the [latest MSI package](https://github.com/bitbeans/SimpleDnsCrypt/releases/download/0.3.3/SimpleDNSCrypt.msi).
You don`t need to download the dnscrypt-resolvers.csv or the dnscrypt-proxy package at all.
Both are included in the msi package, the dnscrypt-resolvers.csv can be updated from inside the software (and will be verified with minisign).
@@ -23,7 +23,7 @@ The MSI package and the SimpleDnsCrypt.exe are signed via a *COMODO RSA Code Sig
The files are signed under the name: *EAM Experience Area Münsingen GmbH*
You also can verify the MSI package with [minisign](https://jedisct1.github.io/minisign/).
-The minisign [signature](https://github.com/bitbeans/SimpleDnsCrypt/releases/download/0.3.2/SimpleDNSCrypt.msi.minisig) can be verified with the following command:
+The minisign [signature](https://github.com/bitbeans/SimpleDnsCrypt/releases/download/0.3.3/SimpleDNSCrypt.msi.minisig) can be verified with the following command:
minisign -Vm SimpleDNSCrypt.msi -P RWTSM+4BNNvkZPNkHgE88ETlhWa+0HDzU5CN8TvbyvmhVUcr6aQXfssV
diff --git a/SimpleDnsCrypt/Properties/AssemblyInfo.cs b/SimpleDnsCrypt/Properties/AssemblyInfo.cs
index 4c3b1fbf..550d8707 100644
--- a/SimpleDnsCrypt/Properties/AssemblyInfo.cs
+++ b/SimpleDnsCrypt/Properties/AssemblyInfo.cs
@@ -14,5 +14,5 @@
ResourceDictionaryLocation.None,
ResourceDictionaryLocation.SourceAssembly
)]
-[assembly: AssemblyVersion("0.3.2")]
-[assembly: AssemblyFileVersion("0.3.2")]
+[assembly: AssemblyVersion("0.3.3")]
+[assembly: AssemblyFileVersion("0.3.3")]
diff --git a/SimpleDnsCrypt/SimpleDnsCrypt.csproj b/SimpleDnsCrypt/SimpleDnsCrypt.csproj
index e045c078..bd807b21 100644
--- a/SimpleDnsCrypt/SimpleDnsCrypt.csproj
+++ b/SimpleDnsCrypt/SimpleDnsCrypt.csproj
@@ -244,6 +244,12 @@
Settings.settings
True
+
+ Always
+
+
+ Always
+
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/SimpleDnsCrypt/ViewModels/MainViewModel.cs b/SimpleDnsCrypt/ViewModels/MainViewModel.cs
index f7e70727..770eafbe 100644
--- a/SimpleDnsCrypt/ViewModels/MainViewModel.cs
+++ b/SimpleDnsCrypt/ViewModels/MainViewModel.cs
@@ -736,7 +736,7 @@ private static bool ValidateDnsCryptProxyFolder()
// check if the file is signed
if (!AuthenticodeTools.IsTrusted(proxyFilePath))
{
- return false;
+ return false;
}
}
}
diff --git a/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv b/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv
index 9a697672..4559221d 100644
--- a/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv
+++ b/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv
@@ -34,7 +34,6 @@ d0wn-nl-ns1,OpenNIC Resolver Netherlands 01 - d0wn,Server provided by Martin 'd0
d0wn-nl-ns2,OpenNIC Resolver Netherlands 02 - d0wn,Server provided by Martin 'd0wn' Albus,Netherlands,,https://dns.d0wn.biz,1,no,yes,yes,185.83.217.248:5353,2.dnscrypt-cert.nl2.d0wn.biz,DFAA:B7D8:29E6:1F34:4FED:2610:4221:70C9:ADC7:7E9F:A65F:4A46:0BAE:A735:3186:3B99,pubkey.nl2.dnscrypt.d0wn.biz
d0wn-random-ns1,DNSCrypt Randomizer 01 - d0wn,Server provided by Martin 'd0wn' Albus,Moldova,,https://dns.d0wn.biz,1,no,yes,yes,178.17.170.133,2.dnscrypt-cert.random.d0wn.biz,A420:867F:ED5C:024C:C86A:EECE:AA05:194B:017F:D2FF:9E72:385A:874F:8CE5:6832:ED2E,pubkey.random.dnscrypt.d0wn.biz
d0wn-random-ns2,DNSCrypt Randomizer 02 - d0wn,Server provided by Martin 'd0wn' Albus,Netherlands,,https://dns.d0wn.biz,1,no,yes,yes,185.14.29.140,2.dnscrypt-cert.random2.d0wn.biz,9112:338E:7D0B:5E78:B792:9BB6:1B75:4888:AC94:65B5:B86B:B5DE:CCF3:E5B9:15A5:DC54,pubkey.random2.dnscrypt.d0wn.biz
-d0wn-ro-ns1,OpenNIC Resolver Romania 01 - d0wn,Server provided by Martin 'd0wn' Albus,Romania,,https://dns.d0wn.biz,1,no,yes,yes,77.81.104.121,2.dnscrypt-cert.ro.d0wn.biz,BE2A:D495:C195:D20E:A7D7:D1F6:5FE3:0B92:D423:684F:AF39:F8B5:F5E8:EE8F:C92F:4E80,pubkey.ro.dnscrypt.d0wn.biz
d0wn-ru-ns1,OpenNIC Resolver Russia 01 - d0wn,Server provided by Martin 'd0wn' Albus,Russia,,https://dns.d0wn.biz,1,no,yes,yes,91.214.71.181:80,2.dnscrypt-cert.ru.d0wn.biz,0ECA:BC40:E0A1:335F:0221:4240:AB86:2919:D16A:2393:CCEB:4B40:9EB9:4F24:3077:ED99,pubkey.ru.dnscrypt.d0wn.biz
d0wn-sg-ns1,OpenNIC Resolver Singapore 01 - d0wn,Server provided by Martin 'd0wn' Albus,Singapore,,https://dns.d0wn.biz,1,no,yes,yes,128.199.248.105:54,2.dnscrypt-cert.sg.d0wn.biz,D82B:2B76:1DA0:8470:B55B:820C:FAAB:9F32:D632:E9E0:5616:2CE7:7D21:E970:98FF:4A34,pubkey.sg.dnscrypt.d0wn.biz
d0wn-tz-ns1,OpenNIC Resolver Tanzania 01 - d0wn,Server provided by Martin 'd0wn' Albus,Tanzania,,https://dns.d0wn.biz,1,no,yes,yes,41.79.69.13,2.dnscrypt-cert.tz.d0wn.biz,B79F:A025:1AF6:2125:DF3E:3B03:856D:4CB7:704E:45EB:B850:3A7B:C6AA:5510:D87D:087D,pubkey.tz.dnscrypt.d0wn.biz
@@ -62,8 +61,6 @@ ns0.dnscrypt.is,"ns0.dnscrypt.is in Reykjavík, Iceland","DNSSEC enabled, non-lo
okturtles,okTurtles,For a surveillance-free world. HTTPS is broken. DNSChain fixes it.,"Georgia, US","33.032501, -83.895699",http://okturtles.com/,1,no,yes,yes,23.226.227.93,2.dnscrypt-cert.okturtles.com,1D85:3953:E34F:AFD0:05F9:4C6F:D1CC:E635:D411:9904:0D48:D19A:5D35:0B6A:7C81:73CB,
opennic-tumabox,TumaBox,Public DNS server operated by TumaBox.org,Germany,,http://wiki.tumabox.org/doku.php?id=dns,1,no,yes,yes,130.255.73.90:5353,2.tumabox.org,D591:7B11:6A35:3114:C238:AA99:A6EB:0C28:7CF7:6805:41AC:5DBF:A8A0:239E:228C:5B06,
ovpnse,OVPN.se Integritet AB,Public DNS server in Sweden by OVPN.se,Sweden,"59.2877011, 18.0771273",https://www.ovpn.se,1,no,yes,no,46.227.67.134:55,2.dnscrypt-cert.dnscrypt01.ovpn.se,B0D6:3658:E23F:5AE1:495C:03C2:319D:D6F1:F2E1:E067:BD23:6F56:503F:27A8:C5D9:2390,
-ovpnto-se,OpenNIC OVPN.to Sweden,by oVPN.to VPN and Proxy service,Sweden,,https://ovpn.to,1,no,yes,yes,95.215.46.195:5353,2.dnscrypt-cert.sweden.ovpn.to,1014:0662:B5D6:B65B:6F55:4367:A77C:A057:DA1A:CE6A:D9ED:1C1F:040E:80A5:895C:83F5,
-ovpnto-se-ipv6,OpenNIC OVPN.to Sweden over IPv6,by oVPN.to VPN and Proxy service,Sweden,,https://ovpn.to,1,no,yes,yes,[2a02:7aa0:1619::c434:714c]:5353,2.dnscrypt-cert.sweden.ovpn.to,1014:0662:B5D6:B65B:6F55:4367:A77C:A057:DA1A:CE6A:D9ED:1C1F:040E:80A5:895C:83F5,
resolv-east,Resolv East,Privacy Centric DNS,beta NYC,,https://resolv.site,1,no,yes,no,45.55.117.60:8080,2.dnscrypt-cert.east.beta.resolv.site,EEB7:8AD6:F56D:EEB9:B9A9:B381:425D:2FD2:E61B:1848:F0EB:C244:482A:3F88:7068:3E7E,
resolv-west,Resolv West,Privacy Centric DNS,beta SFO,,https://resolv.site,1,no,yes,no,45.55.113.239:8080,2.dnscrypt-cert.west.beta.resolv.site,A199:DC1C:13C2:2592:5E9C:523B:2A9E:6D45:5107:19EE:CDB9:A0B3:8B7C:5D99:63CC:8D33,
soltysiak,Soltysiak,Public DNSCrypt server in Poland,Poland,"52.4014619, 16.9278078",http://dc1.soltysiak.com/,1,yes,yes,yes,178.216.201.222:2053,2.dnscrypt-cert.soltysiak.com,25C4:E188:2915:4697:8F9C:2BBD:B6A7:AFA4:01ED:A051:0508:5D53:03E7:1928:C066:8F21,pubkey.dc1.soltysiak.com
diff --git a/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig b/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig
index 0c9aa0d6..60778d62 100644
--- a/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig
+++ b/SimpleDnsCrypt/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig
@@ -1,4 +1,4 @@
untrusted comment: verify with https://jedisct1.github.io/minisign/
-RWQf6LRCGA9i52u9YPS9SqGZUpwwPcxZhsvjCouTQ729r6RPLhPl8lOgWB4Ombq0IqkvtI78/bVnifLmrktEYIzw6o/z/ILJ0wY=
-trusted comment: timestamp:1465146972 file:dnscrypt-resolvers.csv
-+Nm1LFPAGFmTBsz3VMmuoeGmJQFJv0+s5oHFGQUDZESHW+csxGEwLAg9qrpZ/eC2E6NeS5ht9prhhLXlL68WDw==
+RWQf6LRCGA9i57RZIKr/O+03uz0SPNWkPfYlLMloG2wWdYuMfIjXFjDe5V54DHCyQbkt2Hu5ACT1FUHFiyeSsgTfVonPYM/pJww=
+trusted comment: timestamp:1466590003 file:dnscrypt-resolvers.csv
+URCfqjOrMd4q0SSYckGsV7hYtBJxIXHCW8jTEIxKrgAbl+iQeOH8y/WhOQ+fDI79ila3hC/hDcXMkTQd6nG1Dw==
diff --git a/SimpleDnsCrypt/msvcrt.dll b/SimpleDnsCrypt/msvcrt.dll
new file mode 100644
index 00000000..00ff4541
Binary files /dev/null and b/SimpleDnsCrypt/msvcrt.dll differ
diff --git a/SimpleDnsCrypt/vcruntime140.dll b/SimpleDnsCrypt/vcruntime140.dll
new file mode 100644
index 00000000..f65959c5
Binary files /dev/null and b/SimpleDnsCrypt/vcruntime140.dll differ