fold in one more

2011-09-13 18:34:50 -04:00 · 2011-09-13 18:34:50 -04:00 · 8a6a95abb4
parent a4ed8622c0
commit 8a6a95abb4
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -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
--- a/changes/bug4014
+++ b/changes/bug4014
@ -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.