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)
commitcc7d45f64eafea64927715aaf83293949496c1c6
tree3e2c8cbd16d582c51c7451905d56ea8514ca4d63
parent3445505f1db5130e2b292981730028fb655d084f
parent1163af8bcb53ea12570940005bd18370037554b2
Merge pull request #1610 from damianorenfer/master

net/dnscrypt-proxy: Set default provider to cisco, add client key support in config