fold in changes files so far

diff --git a/ChangeLog b/ChangeLog
index 7b2581662a2eac866d78a30fac84bcc10f8afe75..58c17a861d25a67b2774e85fff1a9365f9c82ebb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Changes in version 0.2.2.33 - 2011-09-??
+  o Major bugfies:
+    - Avoid an assertion failure when reloading a configuration with
+      TrackExitHosts changes. Found and fixed by 'laruldan'. Fixes bug
+      3923; bugfix on 0.2.2.25-alpha.
+
+  o Minor bugfixes:
+    - Correct the man page to explain that HashedControlPassword and
+      CookieAuthentication can both be set, in which case either method
+      is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha,
+      when we decided to allow these config options to both be set. Issue
+      raised by bug 3898.
+
+  o Build fixes:
+    - Provide a substitute implementation of lround() for MSVC, which
+      apparently lacks it. Patch from Gisle Vanem.
+
+
 Changes in version 0.2.2.32 - 2011-08-27
   The Tor 0.2.2 release series is dedicated to the memory of Andreas
   Pfitzmann (1958-2010), a pioneer in anonymity and privacy research,

diff --git a/changes/bug3898a b/changes/bug3898a
deleted file mode 100644 (file)
index d40445e..0000000
--- a/changes/bug3898a
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Correct the man page to explain that HashedControlPassword and
-      CookieAuthentication can both be set, in which case either method
-      is sufficient to authenticate to Tor. Bugfix on 0.2.0.7-alpha,
-      when we decided to allow these config options to both be set. Issue
-      raised by bug 3898.

diff --git a/changes/bug3923 b/changes/bug3923
deleted file mode 100644 (file)
index 9c0e138..0000000
--- a/changes/bug3923
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfies:
-    - Avoid an assertion failure when reloading a configuration with
-      TrackExitHosts changes.  Found and fixed by 'laruldan'. Fixes
-      bug 3923; bugfix on 0.2.2.25-alpha.
-

diff --git a/changes/msvc_lround b/changes/msvc_lround
deleted file mode 100644 (file)
index e4aea95..0000000
--- a/changes/msvc_lround
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Build fixes:
-    - Provide a substitute implementation of lround() for MSVC, which
-      apparently lacks it.  Patch from Gisle Vanem.
-