fold in more changes files

11 files changed, 46 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index c920dc477c..8d47e3d684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.2.24-alpha - 2011-0?-??
+Changes in version 0.2.2.24-alpha - 2011-04-0?
   o Major bugfixes:
     - Directory authorities now use data collected from their own
       uptime observations when choosing whether to assign the HSDir flag
@@ -28,16 +28,56 @@ Changes in version 0.2.2.24-alpha - 2011-0?-??
       like Vidalia, in which case the controller would never get a
       REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha;
       fixes bug 1172.
-    - When a relay has failed several reachability tests, directory
-      authorities are more accurate at recording when it became
-      unreachable, so we can in turn provide more accuracy at assigning
-      Stable, Guard, HSDir, etc flags. Bugfix on 0.2.0.6-alpha. Resolves
-      bug 2716.
+    - Make directory authorities more accurate at recording when
+      relays that have failed several reachability tests became
+      unreachable, so we can provide more accuracy at assigning Stable,
+      Guard, HSDir, etc flags. Bugfix on 0.2.0.6-alpha. Resolves bug 2716.
+    - Fix an issue that prevented static linking of libevent on
+      some platforms (notably Linux). Fixes bug 2698; bugfix on
+      versions 0.2.1.23/0.2.2.8-alpha (the versions introducing
+      the --with-static-libevent configure option).
+    - We now ask the other side of a stream (the client or the exit)
+      for more data on that stream when the amount of queued data on
+      that stream dips low enough. Previously, we wouldn't ask the
+      other side for more data until either it sent us more data (which
+      it wasn't supposed to do if it had exhausted its window!) or we
+      had completely flushed all our queued data. This flow control fix
+      should improve throughput. Fixes bug 2756; bugfix on the earliest
+      released versions of Tor (svn commit r152).
+    - Avoid a double-mark-for-free warning when failing to attach a
+      transparent proxy connection. (We thought we had fixed this in
+      0.2.2.23-alpha, but it turns out our fix was checking the wrong
+      connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original
+      bug) and 0.2.2.23-alpha (the incorrect fix).
+    - When warning about missing zlib development packages during compile,
+      give the correct package names. Bugfix on 0.2.0.1-alpha.
+
+  o Minor features:
+    - Directory authorities now log the source of a rejected POSTed v3
+      networkstatus vote.
+    - Make compilation with clang possible when using
+      --enable-gcc-warnings by removing two warning optionss that clang
+      hasn't implemented yet and by fixing a few warnings. Implements
+      ticket 2696.
+    - When expiring circuits, use microsecond timers rather than
+      one-second timers. This can avoid an unpleasant situation where a
+      circuit is launched near the end of one second and expired right
+      near the beginning of the next, and prevent fluctuations in circuit
+      timeout values.
+    - Use computed circuit-build timeouts to decide when to launch
+      parallel introduction circuits for hidden services. (Previously,
+      we would retry after 15 seconds.)
 
   o Packaging fixes:
     - Create the /var/run/tor directory on startup on OpenSUSE if it is
       not already created. Patch from Andreas Stieger. Fixes bug 2573.
 
+  o Documentation changes:
+    - Modernize the doxygen configuration file slightly. Fixes bug 2707.
+    - Resolve all doxygen warnings except those for missing documentation.
+      Fixes bug 2705.
+    - Add doxygen documentation for more functions, fields, and types.
+
 
 Changes in version 0.2.2.23-alpha - 2011-03-08
   Tor 0.2.2.23-alpha lets relays record their bandwidth history so when
diff --git a/changes/bug2683a b/changes/bug2683a
deleted file mode 100644
index 2fe308b030..0000000000
--- a/changes/bug2683a
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features
-    - Log the source of a rejected POSTed v3 networkstatus vote.
-
diff --git a/changes/bug2696 b/changes/bug2696
deleted file mode 100644
index 6ea41d4a6a..0000000000
--- a/changes/bug2696
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Make compilation with clang possible when using
-      --enable-gcc-warnings by removing two warnings that clang hasn't
-      implemented yet and by fixing a few warnings. Implements ticket
-      2696.
diff --git a/changes/bug2698 b/changes/bug2698
deleted file mode 100644
index d995788bfc..0000000000
--- a/changes/bug2698
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Fix an issue that prevented static linking of libevent on
-      some platforms (notably Linux). Fixes bug 2698, bugfix on
-      versions 0.2.1.23/0.2.2.8-alpha (the versions introducing
-      the --with-static-libevent configure option).
-
diff --git a/changes/bug2756 b/changes/bug2756
deleted file mode 100644
index 0cad515a1b..0000000000
--- a/changes/bug2756
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Minor bugfixes (spec conformance, performance):
-    - We now ask the other side of a stream (the client or the exit)
-      for more data on that stream when the amount of queued data on
-      that stream dips low enough.  Previously, we wouldn't ask the
-      other side for more data until either it sent us more data
-      (which it wasn't supposed to do if it had exhausted its
-      window!) or until we had completely flushed all our queued
-      data.  Fixing this should improve throughput.  Fixes bug 2756;
-      bugfix on the earliest released versions of Tor (svn commit
-      r152).
-
diff --git a/changes/bug2757 b/changes/bug2757
deleted file mode 100644
index f947afaeb4..0000000000
--- a/changes/bug2757
+++ /dev/null
@@ -1,6 +0,0 @@
-  - Minor bugfixes
-    o Avoid a double-mark-for-free warning when failing to attach a
-      transparent proxy connection.  (We thought we had fixed this in
-      0.2.2.23-alpha, but it turns out our fix was checking the wrong
-      connection.)  Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original
-      bug) and 0.2.2.23-alpha (the incorrect fix).
diff --git a/changes/cbt_hi_res b/changes/cbt_hi_res
deleted file mode 100644
index c0df1183cb..0000000000
--- a/changes/cbt_hi_res
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor features
-    - When expiring circuits, use microsecond timers rather than one-second
-      timers.  This can avoid an unpleasant situation where a circuit is
-      launched near the end of one second and expired right near the
-      beginning of the next, and prevent fluctuations in circuit timeout
-      values.
-
diff --git a/changes/cbt_parallel_intro b/changes/cbt_parallel_intro
deleted file mode 100644
index 44e377fb3f..0000000000
--- a/changes/cbt_parallel_intro
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features
-    - Use computed circuit-build timeouts to decide when to launch
-      parallel introdution circuits.  (Previously, we would retry
-      after 15 seconds.)
diff --git a/changes/doxygen b/changes/doxygen
deleted file mode 100644
index 5e5fcd12d6..0000000000
--- a/changes/doxygen
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Documentation changes
-    - Modernize the doxygen configuration file slightly.  Fixes bug 2707.
-    - Resolve all doxygen warnings except those for missing documentation.
-      Fixes bug 2705.
-    - Add doxygen documentation for more functions, fields, and types.
-
diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01
deleted file mode 100644
index 3830df388f..0000000000
--- a/changes/log-typo-2011-03-15-01
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes
-    - Fix a minor typo in a log message.  Bugfix on 0.2.2.6-alpha.
-
diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl
deleted file mode 100644
index dd8e10a328..0000000000
--- a/changes/zlib_aint_openssl
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes
-    - When warning about missing zlib development packages, give the
-      correct package names.  Bugfix on 0.2.0.1-alpha.