[svn] GnuPG - r4714 - in branches/STABLE-BRANCH-1-4: . g10

[svn author wk]

Author: wk
Date: 2008-03-25 09:34:02 +0100 (Tue, 25 Mar 2008)
New Revision: 4714

Modified:
   branches/STABLE-BRANCH-1-4/NEWS
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/options.skel
Log:
Change default keyserver.


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-03-25 08:33:31 UTC (rev 4713)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2008-03-25 08:34:02 UTC (rev 4714)
@@ -1,3 +1,7 @@
+2008-03-25  Werner Koch  <wk at g10code.com>
+
+	* options.skel: Make the default keyserver keys.gnupg.net.
+
 2008-03-23  David Shaw  <dshaw at jabberwocky.com>
 
 	* import.c (collapse_uids): Fix bug 894: possible memory

Modified: branches/STABLE-BRANCH-1-4/NEWS
===================================================================
--- branches/STABLE-BRANCH-1-4/NEWS	2008-03-25 08:33:31 UTC (rev 4713)
+++ branches/STABLE-BRANCH-1-4/NEWS	2008-03-25 08:34:02 UTC (rev 4714)
@@ -4,6 +4,7 @@
     * 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)

Modified: branches/STABLE-BRANCH-1-4/g10/options.skel
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/options.skel	2008-03-25 08:33:31 UTC (rev 4713)
+++ branches/STABLE-BRANCH-1-4/g10/options.skel	2008-03-25 08:34:02 UTC (rev 4714)
@@ -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:pgp-public-keys at keys.nl.pgp.net
 #keyserver ldap://keyserver.pgp.com