Sync .gnupg changes with minimal branch.

.gnupg/gpg.conf

@@ -17,7 +17,7 @@ display-charset iso-8859-1
 auto-key-locate cert keyserver ldap hkp://subkeys.pgp.net
 
 # Retrieve keys from keyservers when validating.
-auto-key-retrieve
+keyserver-options auto-key-retrieve
 
 # Show full keyid and fingerprints.
 keyid-format long
@@ -30,4 +30,5 @@ keyserver-options include-subkeys
 no-greeting
 
 # Use loopbacking to obtain passphrases.
-pinentry-mode loopback
+# This is supported with gpg2, but not gpg.
+# pinentry-mode loopback