Change default keyserver.

3 files changed, 10 insertions, 3 deletions

diff --git a/NEWS b/NEWS
index 03e9ae6dc..040e3ca25 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Noteworthy changes in version 1.4.9 (unreleased)
     * Improved AES encryption performance by more than 20% (on ia32).
       Decryption is also a bit faster.
 
+    * Fixed possible memory corruption while importing OpenPGP keys.
 
 
 Noteworthy changes in version 1.4.8 (2007-12-20)
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 0cd4cd226..523b39791 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-25  Werner Koch  <[email protected]>
+
+	* options.skel: Make the default keyserver keys.gnupg.net.
+
 2008-03-23  David Shaw  <[email protected]>
 
 	* import.c (collapse_uids): Fix bug 894: possible memory
diff --git a/g10/options.skel b/g10/options.skel
index c3cc4a06c..e51ef954f 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -93,6 +93,7 @@
 # support).
 #
 # Example HKP keyserver:
+#      hkp://keys.gnupg.net
 #      hkp://subkeys.pgp.net
 #
 # Example email keyserver:
@@ -109,11 +110,12 @@
 # Note that most servers (with the notable exception of
 # ldap://keyserver.pgp.com) synchronize changes with each other.  Note
 # also that a single server name may actually point to multiple
-# servers via DNS round-robin.  hkp://subkeys.pgp.net is an example of
+# servers via DNS round-robin.  hkp://keys.gnupg.net is an example of
 # such a "server", which spreads the load over a number of physical
-# servers.
+# servers.  To see the IP address of the server actually used, you may use
+# the "--keyserver-options debug".
 
-keyserver hkp://subkeys.pgp.net
+keyserver hkp://keys.pgp.net
 #keyserver mailto:[email protected]
 #keyserver ldap://keyserver.pgp.com