From 55df654ea8ca1c3bfae65c33f555c0b1d1f4d6f0 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Mon, 6 Nov 2006 04:07:33 +0000
Subject: [PATCH] Missing changelog entry

---
 g10/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index f92c0fd02..763f468e2 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -2,6 +2,15 @@
 
 	* gpg.c (main): New command --gpgconf-list.
 
+2006-10-12  David Shaw  <dshaw@jabberwocky.com>
+
+	* parse-packet.c (parse_symkeyenc): Show the unpacked as well as
+	the packed s2k iteration count.
+
+	* main.h, options.h, gpg.c (encode_s2k_iterations, main),
+	passphrase.c (hash_passphrase): Add --s2k-count option to specify
+	the number of s2k hash iterations.
+
 2006-10-06  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (keyserver_spawn): Write the 16-digit keyid rather