aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-08-16 14:06:06 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-08-16 14:06:06 +1200
commit52d8f963d4219e0643038da972b20c47acc9483c (patch)
tree9981b7a5ac7cdbe437879bc251ed7732e869b277
parentMerge branch 'release/v7.8.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-52d8f963d4219e0643038da972b20c47acc9483c.tar.gz
dotfiles-52d8f963d4219e0643038da972b20c47acc9483c.zip
Merge branch 'release/v7.9.0'v7.9.0
* release/v7.9.0: Adjust keyserver choice to leverage Tor presence
-rw-r--r--VERSION4
-rw-r--r--gnupg/dirmngr.conf11
2 files changed, 12 insertions, 3 deletions
diff --git a/VERSION b/VERSION
index 2f5d4a2e..370c7205 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v7.8.0
-Thu, 15 Aug 2019 12:19:32 +0000
+tejr dotfiles v7.9.0
+Fri, 16 Aug 2019 02:06:04 +0000
diff --git a/gnupg/dirmngr.conf b/gnupg/dirmngr.conf
index c9532a85..5c6a4ca1 100644
--- a/gnupg/dirmngr.conf
+++ b/gnupg/dirmngr.conf
@@ -1 +1,10 @@
-use-tor
+# From `man 1 dirmngr` for GnuPG 2.1.18:
+# > If exactly two keyservers are configured and only one is a Tor
+# > hidden service (.onion), Dirmngr selects the keyserver to use
+# > depending on whether Tor is locally running or not. The check for
+# > a running Tor is done for each new connec‐ tion. If no keyserver is
+# > explicitly configured, dirmngr will use the built-in default of
+# > hkps://hkps.pool.sks-key‐servers.net.
+#
+keyserver hkp://jirk5u4osbsr34t5.onion
+keyserver hkps://hkps.pool.sks-keyservers.net