Change 0.2.5.9 to 0.2.5.9-rc in the changelog; write a draft blurb

2 files changed, 7 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 21b0a5cb9e..da39a94c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
-Changes in version 0.2.5.9 - 2014-10-2x
-  Tor 0.2.5.9, the first stable release in the 0.2.5 branch, XXXXX
-  WRITEME XXXXX DO NOT RELEASE WITHOUT FINISHING THIS PARAGRAPH. XXXXX
+Changes in version 0.2.5.9-rc - 2014-10-xx
 
-  Below are the changes since 0.2.5.8-rc; see the ReleaseNotes file for
-  a list of changes since the 0.2.4 branch.
+  Tor 0.2.5.9-rc is the third release candidate for the Tor 0.2.5.x
+  series. It contains a response to the recent "POODLE" attack against
+  SSL3 (which doesn't affect Tor), and a response to a crash bug caused
+  by some operating systems' response to the "POODLE" attack (which does
+  affect Tor). It also contains a few miscellaneous fixes.
 
   o Major security fixes:
     - Disable support for SSLv3. All versions of OpenSSL in use with Tor
diff --git a/ReleaseNotes b/ReleaseNotes
index f26d40abeb..fb045aa5a5 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,7 +2,7 @@ This document summarizes new features and bugfixes in each stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
-Changes in version 0.2.5.9 - 2014-10-2x
+Changes in version 0.2.5.xx - 2014-10-xx
   o Deprecated versions:
     - Tor 0.2.2.x has reached end-of-life; it has received no patches or
       attention for some while. Directory authorities no longer accept