Merge pull request #1610 from damianorenfer/master
authorTed Hess <thess@kitschensync.net>
Wed, 22 Jul 2015 18:12:33 +0000 (14:12 -0400)
committerTed Hess <thess@kitschensync.net>
Wed, 22 Jul 2015 18:12:33 +0000 (14:12 -0400)
net/dnscrypt-proxy: Set default provider to cisco, add client key support in config


Trivial merge