From: Roger Dingledine <arma@torproject.org>
Date: Tue, 13 Sep 2011 22:34:50 +0000 (-0400)
Subject: fold in one more
X-Git-Tag: tor-0.2.2.33~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a6a95abb468b1a8d68683ac6995c1cb6e5e9a70;p=thirdparty%2Ftor.git

fold in one more
---

diff --git a/ChangeLog b/ChangeLog
index ba1d3757a6..d82ba49398 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 9c20c6c337..0000000000
--- 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.