[tor-commits] [tor/release-0.2.2] always more commits waiting!

[arma at torproject.org]

commit dcdccedd2411b5a07b41cbb128910ad27fc0e7ea
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 16:32:54 2011 -0400

    always more commits waiting!
---
 ChangeLog      |    7 +++++++
 changes/cov479 |    5 -----
 changes/cov484 |    4 ----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4b508eb..1e0e466 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,13 @@ Changes in version 0.2.2.34 - 2011-10-??
     - Bridges now skip DNS self-tests, to act a little more stealthily.
       Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced
       bridges. Patch by "warms0x".
+    - Fix internal bug-checking logic that was supposed to catch
+      failures in digest generation so that it will fail more robustly
+      if we ask for a nonexistent algorithm. Found by Coverity Scan.
+      Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479.
+    - Report any failure in init_keys() calls launched because our
+      IP address has changed. Spotted by Coverity Scan. Bugfix on
+      0.1.1.4-alpha; fixes CID 484.
 
   o Minor bugfixes (log messages and documentation):
     - Remove a confusing dollar sign from the example fingerprint in the
diff --git a/changes/cov479 b/changes/cov479
deleted file mode 100644
index afbaffc..0000000
--- a/changes/cov479
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix internal bug-checking logic that was supposed to catch
-      failures in digest generation so that it will fail more robustly
-      if we ask for a nonexistent algorithm. Found by Coverity Scan.
-      Bugfix on 0.2.2.1-alpha; fixes Coverity CID 479.
diff --git a/changes/cov484 b/changes/cov484
deleted file mode 100644
index 33adbda..0000000
--- a/changes/cov484
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Report any failure in init_keys() calls done because our IP address
-      has changed. Spotted by Coverity Scan. Bugfix on 0.1.1.4-alpha;
-      fixes CID 484.