[tor-commits] [torbirdy/master] Disable `--throw-keyids' by default

[sukhbir at torproject.org]

commit ca2a580fcacbca5e84ca8d6fdc29d051d7cbd2de
Author: adrelanos <adrelanos at riseup.net>
Date:   Fri Sep 6 15:24:35 2013 +0000

    Disable `--throw-keyids' by default
    
    as per https://github.com/ioerror/torbirdy/commit/bdbcdac4c0415d5ea4e00bdb08be407b5ec1300f
---
 gpg.conf |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/gpg.conf b/gpg.conf
index c9534db..43346a0 100644
--- a/gpg.conf
+++ b/gpg.conf
@@ -9,9 +9,6 @@ no-emit-version
 ## Don't add additional comments (may leak language, etc)
 no-comments
 
-## Don't include keyids that may disclose the sender or any other non-obvious keyids
-throw-keyids
-
 ## We want to force UTF-8 everywhere
 display-charset utf-8
 
@@ -75,3 +72,16 @@ sig-notation issuer-fpr at notations.openpgp.fifthhorseman.net=%g
 
 ## END Some suggestions added from riseup https://we.riseup.net/riseuplabs+paow/openpgp-best-practices
 ##################################################################
+
+##################################################################
+## BEGIN Some suggestions from TorBirdy opt-in's
+
+## Up to you whether you in comment it (remove the single # in front of
+## it) or not. Disabled by default, because it causes too much complaints and
+## confusion.
+
+## Don't include keyids that may disclose the sender or any other non-obvious keyids
+#throw-keyids
+
+## END Some suggestions from TorBirdy opt-in's
+##################################################################