[tor-commits] [tor/release-0.2.2] fold in one more

[arma at torproject.org]

commit 8a6a95abb468b1a8d68683ac6995c1cb6e5e9a70
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Sep 13 18:34:50 2011 -0400

    fold in one more
---
 ChangeLog       |    2 ++
 changes/bug4014 |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ba1d375..d82ba49 100644
--- 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
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.