fold in 0.2.3.22-rc changes

3 files changed, 15 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e78957218..a1165aa99a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Changes in version 0.2.3.22-rc - 2012-09-11
+  Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable
+  assertion.
+
+  o Security fixes:
+    - Fix an assertion failure in tor_timegm() that could be triggered
+      by a badly formatted directory object. Bug found by fuzzing with
+      Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc.
+
+  o Minor bugfixes:
+    - Avoid segfault when starting up having run with an extremely old
+      version of Tor and parsing its state file. Fixes bug 6801; bugfix
+      on 0.2.2.23-alpha.
+
+
 Changes in version 0.2.3.21-rc - 2012-09-05
   Tor 0.2.3.21-rc is the fourth release candidate for the Tor 0.2.3.x
   series. It fixes a trio of potential security bugs, fixes a bug where
diff --git a/changes/bug6801 b/changes/bug6801
deleted file mode 100644
index ef21acc98f..0000000000
--- a/changes/bug6801
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Avoid segfault when starting up having run with an extremely old
-      version of Tor and parsing its state file. Fixes bug 6801; bugfix on
-      0.2.2.23-alpha.
-
diff --git a/changes/bug6811 b/changes/bug6811
deleted file mode 100644
index 841ec1c54a..0000000000
--- a/changes/bug6811
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major security fixes:
-    - Fix an assertion failure in tor_timegm that could be triggered
-      by a badly formatted directory object.  Bug found by fuzzing with
-      Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc.
-