fold in one more

diff --git a/ChangeLog b/ChangeLog
index ba1d3757a66430caedc723e8d216ce92ad78e638..d82ba493985f725f729743f85364c1942e2a7b26 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ Changes in version 0.2.2.33 - 2011-09-??
     - Change the default required uptime for a relay to be accepted as
       a HSDir from 24 hours to 25 hours. Improves on 0.2.0.10-alpha;
       resolves ticket 2649.
+    - Adjust the expiration time on our SSL session certificates to
+      better match SSL certs seen in the wild. Resolves ticket 4014.
 
   o Minor bugfixes:
     - Correct the man page to explain that HashedControlPassword and

diff --git a/changes/bug4014 b/changes/bug4014
deleted file mode 100644 (file)
index 9c20c6c..0000000
--- a/changes/bug4014
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Adjust the expiration time on our SSL session certificates to
-      better match SSL certs seen in the wild. Resolves ticket 4014.