[or-cvs] [tor/release-0.2.1 3/3] integrate the changelog entry

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Tue, 23 Nov 2010 22:26:48 -0500
Subject: integrate the changelog entry
Commit: 924f7bf9a5c3c960d17c360c9f75a5a43e7b735c

---
 ChangeLog                 |    2 ++
 changes/mingw-openssl098m |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 changes/mingw-openssl098m

diff --git a/ChangeLog b/ChangeLog
index ced4fba..b97d20b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,8 @@ Changes in version 0.2.1.27 - 2010-11-23
       stream ending reason for this case: END_STREAM_REASON_NOROUTE.
       Servers can start sending this code when enough clients recognize
       it. Bugfix on 0.1.0.1-rc; fixes part of bug 1793.
+    - Build correctly on mingw with more recent versions of OpenSSL 0.9.8.
+      Patch from mingw-san.
 
   o Removed files:
     - Remove the old debian/ directory from the main Tor distribution.
diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m
deleted file mode 100644
index b419976..0000000
--- a/changes/mingw-openssl098m
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features
-   - Build correctly on mingw with more recent version of OpenSSL 0.9.8.
-     Patch from mingw-san.
-- 
1.7.1