remove duplicate changelog entries

svn:r15784

diff --git a/ChangeLog b/ChangeLog
index b0678707891b511651df634f2f8760685f48e383..bdd00fd08c696e4da28a7fd1574afe9e7629eb18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,23 +4,15 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
       reason is NO_ROUTE (that is, our network is down).
 
   o Major bugfixes:
-    - Try to attach connections immediately upon receiving a RENDEZVOUS2 or
-      RENDEZVOUS_ESTABLISHED cell.  This can save a second or two on the
-      client side when connecting to a hidden service.  Bugfix on 0.0.6pre1.
-      Found and fixed by Christian Wilms; resolves bug 743.
+    - Try to attach connections immediately upon receiving a RENDEZVOUS2
+      or RENDEZVOUS_ESTABLISHED cell. This can save a second or two
+      on the client side when connecting to a hidden service. Bugfix
+      on 0.0.6pre1. Found and fixed by Christian Wilms; resolves bug 743.
 
   o Minor bugfixes:
     - Change the contrib/tor.logrotate script so it makes the new
       logs as "_tor:_tor" rather than the default, which is generally
       "root:wheel". Fixes bug 676, reported by Serge Koksharov.
-    - Fix macro collision between OpenSSL 0.9.8h and Windows headers.
-      Fixes bug 704; fix from Steven Murdoch.
-    - When opening /dev/null in finish_daemonize(), do not pass the
-      O_CREAT flag.  Fortify was complaining, and correctly so.  Fixes
-      bug 742; fix from Michael Scherer.  Bugfix on 0.0.2pre19.
-    - Correctly detect transparent proxy support on Linux hosts that
-      require in.h to be included before netfilter_ipv4.h.  Patch from
-      coderman.
 
 
 Changes in version 0.2.0.29-rc - 2008-07-08