[tor-commits] [tor/release-0.2.2] fold in recent changelog entries

[arma at torproject.org]

commit 4747c84241318f6bff8570a81a2f234560595b4e
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Apr 17 14:59:29 2011 -0400

    fold in recent changelog entries
---
 ChangeLog                        |    5 +++++
 changes/osx_forgotten_compilefix |    4 ----
 changes/win_tmp_dir              |    4 ----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce68ccb..ca782b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@ Changes in version 0.2.2.25-alpha - 2011-04-??
     - When a client finds that an origin circuit has run out of 16-bit
       stream IDs, we now mark it as unusable for new streams. Previously,
       we would try to close the entire circuit. Bugfix on Tor 0.0.6.
+    - Added a forgotten cast that caused a compile warning on OS X
+      10.6. Bugfix on 0.2.2.24-alpha.
 
   o Minor features:
     - Send END_STREAM_REASON_NOROUTE in response to EHOSTUNREACH errors.
@@ -32,6 +34,9 @@ Changes in version 0.2.2.25-alpha - 2011-04-??
       in three places, and we never adjusted the known/unknown skew
       values. This is still something we might want to do someday,
       but if we do, we'll want to do it differently.
+    - Use GetTempDir to find the proper temporary directory location on
+      Windows when generating temporary files for the unit tests. Patch
+      by Gisle Vanem.
 
 
 Changes in version 0.2.2.24-alpha - 2011-04-08
diff --git a/changes/osx_forgotten_compilefix b/changes/osx_forgotten_compilefix
deleted file mode 100644
index 754e09c..0000000
--- a/changes/osx_forgotten_compilefix
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Added a forgotten cast that caused a compile warning on OS X 10.6. Bugfix
-      on 0.2.2.24-alpha.
-
diff --git a/changes/win_tmp_dir b/changes/win_tmp_dir
deleted file mode 100644
index 13f6e7f..0000000
--- a/changes/win_tmp_dir
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Unit tests:
-    - Use GetTempDir to find the proper temporary directory location on
-      Windows when generating temporary files for the unit tests.  Patch
-      by Gisle Vanem.