[tor-commits] [torbirdy/develop] Use Tor's SOCKSPort for Enigmail's keyserver configuration.

[sukhbir at torproject.org]

commit 89bf536f14872660815886f480cc88902904d4aa
Author: anonym <anonym at riseup.net>
Date:   Fri Mar 18 17:42:16 2016 +0100

    Use Tor's SOCKSPort for Enigmail's keyserver configuration.
    
    It's not necessarily the case that users have an HTTP proxy running on
    port 8118, and if they do it may be a non-torified Privoxy instance.
    
    Using the Tor SOCKSPort will always work, and be torified.
---
 chrome/content/preferences.js | 2 +-
 components/torbirdy.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js
index de77205..94ccb39 100644
--- a/chrome/content/preferences.js
+++ b/chrome/content/preferences.js
@@ -41,7 +41,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() {
     if (pub.prefs.getBoolPref("extensions.torbirdy.enigmail.throwkeyid")) {
       opts += "--throw-keyids ";
     }
-    var proxy = "http-proxy=http://127.0.0.1:8118";
+    var proxy = "socks5h://127.0.0.1:9050";
     if (anonService === "jondo") {
       proxy = "http://127.0.0.1:4001";
     }
diff --git a/components/torbirdy.js b/components/torbirdy.js
index 2efcfec..06ae80c 100644
--- a/components/torbirdy.js
+++ b/components/torbirdy.js
@@ -223,7 +223,7 @@ const TorBirdyPrefs = {
                                               // We want to force UTF-8 everywhere
                                               "--display-charset utf-8 " +
                                               // We want to ensure that Enigmail is proxy aware even when it runs gpg in a shell
-                                              "--keyserver-options http-proxy=http://127.0.0.1:8118 ",
+                                              "--keyserver-options http-proxy=socks5h://127.0.0.1:9050 ",
                                             
   // 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",