commit ac74d777a3a7fd53d3f52a278e7bad4959070bee Author: intrigeri <intrigeri@boum.org> Date: Tue Jan 31 15:54:01 2017 +0000 Use the Tor OnionBalance hidden service pool as the default keyserver. --- chrome/content/preferences.js | 2 +- components/torbirdy.js | 4 ++-- gpg.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 59fe209..eb4c9b8 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -7,7 +7,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.prefBranch = "extensions.torbirdy."; pub.customBranch = "extensions.torbirdy.custom."; - pub.torKeyserver = "hkp://qdigse2yzvuglcix.onion"; + pub.torKeyserver = "hkp://jirk5u4osbsr34t5.onion"; pub.jondoKeyserver = "hkp://pool.sks-keyservers.net"; pub.prefs = Components.classes["@mozilla.org/preferences-service;1"] diff --git a/components/torbirdy.js b/components/torbirdy.js index 41baf5f..ebdef02 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -274,8 +274,8 @@ var TorBirdyPrefs = { // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell "--keyserver-options http-proxy=socks5h://127.0.0.1:9150 ", - // The default key server should be a hidden service and this is the only known one (it's part of the normal SKS network) - "extensions.enigmail.keyserver": "hkp://qdigse2yzvuglcix.onion", + // The default key server should be a hidden service; use the Tor OnionBalance hidden service pool (https://sks-keyservers.net/overview-of-pools.php#pool_tor) + "extensions.enigmail.keyserver": "hkp://jirk5u4osbsr34t5.onion", // Force GnuPG to use SHA512. "extensions.enigmail.mimeHashAlgorithm": 5, diff --git a/gpg.conf b/gpg.conf index 82a20c7..a499eaa 100644 --- a/gpg.conf +++ b/gpg.conf @@ -19,7 +19,7 @@ display-charset utf-8 ## Proxy settings keyserver-options http-proxy=socks5://TORIP:TORPORT -keyserver hkp://qdigse2yzvuglcix.onion +keyserver hkp://jirk5u4osbsr34t5.onion ## END some suggestions from TorBirdy TorBirdy setting extensions.enigmail.agentAdditionalParam ##################################################################