fold in the recent changes files

9 files changed, 59 insertions, 73 deletions

diff --git a/ChangeLog b/ChangeLog
index f6f23d4a6a..fefa901fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 Changes in version 0.2.2.16-alpha - 2010-09-1?
-  o Major features:
-    - If you configure your bridge with a known identity fingerprint,
-      and the bridge authority is unreachable (as it is in at least
-      one country now), fall back to directly requesting the descriptor
-      from the bridge. Finishes the feature started in 0.2.0.10-alpha;
-      closes bug 1138.
-
   o Major bugfixes (stream-level fairness):
+    - When receiving a circuit-level SENDME for a blocked circuit, try
+      to package cells fairly from all the streams that had previously
+      been blocked on that circuit. Previously, we had started with the
+      oldest stream, and allowed each stream to potentially exhaust
+      the circuit's package window. This gave older streams on any
+      given circuit priority over newer ones. Fixes bug 1937. Detected
+      originally by Camilo Viecco. This bug was introduced before the
+      first Tor release, in svn commit r152: it is the new winner of
+      the longest-lived bug prize.
     - When the exit relay got a circuit-level sendme cell, it started
       reading on the exit streams, even if had 500 cells queued in the
       circuit queue already, so the circuit queue just grew and grew in
@@ -29,13 +31,31 @@ Changes in version 0.2.2.16-alpha - 2010-09-1?
       Closes bug 1843. Suggested by katmagic.
     - When logging a rate-limited warning, we now mention how many messages
       got suppressed since the last warning.
+    - Add new "perconnbwrate" and "perconnbwburst" consensus params to
+      do individual connection-level rate limiting of clients. The torrc
+      config options with the same names trump the consensus params, if
+      both are present. Replaces the old "bwconnrate" and "bwconnburst"
+      consensus params which were broken from 0.2.2.7-alpha through
+      0.2.2.14-alpha. Closes bug 1947.
+    - When a router changes IP address or port, authorities now launch
+      a new reachability test for it. Implements ticket 1899.
+    - Make the formerly ugly "2 unknown, 7 missing key, 0 good, 0 bad,
+      2 no signature, 4 required" messages about consensus signatures
+      easier to read, and make sure they get logged at the same severity
+      as the messages explaining which keys are which. Fixes bug 1290.
+    - Don't warn when we have a consensus that we can't verify because
+      of missing certificates, unless those certificates are ones
+      that we have been trying and failing to download. Fixes bug 1145.
+    - If you configure your bridge with a known identity fingerprint,
+      and the bridge authority is unreachable (as it is in at least
+      one country now), fall back to directly requesting the descriptor
+      from the bridge. Finishes the feature started in 0.2.0.10-alpha;
+      closes bug 1138.
+    - When building with --enable-gcc-warnings on OpenBSD, disable
+      warnings in system headers. This makes --enable-gcc-warnings
+      pass on OpenBSD 4.8.
 
-  o Minor bugfixes:
-    - Fix a regression introduced in 0.2.2.7-alpha that marked relays
-      down if a directory fetch fails and you've configured either
-      bridges or EntryNodes. The intent was to mark the relay as down
-      _unless_ you're using bridges or EntryNodes, since if you are
-      then you could quickly run out of entry points.
+  o Minor bugfixes (on 0.2.1.x and earlier):
     - Authorities will now attempt to download consensuses if their
       own efforts to make a live consensus have failed. This change
       means authorities that restart will fetch a valid consensus, and
@@ -52,20 +72,38 @@ Changes in version 0.2.2.16-alpha - 2010-09-1?
       were open. Bugfix on 0.2.1.26; fixes bug 1840. Thanks to mingw-san
       for analysis help.
     - Rate-limit "Failed to hand off onionskin" warnings.
+    - Never relay a cell for a circuit we have already destroyed.
+      Between marking a circuit as closeable and finally closing it,
+      it may have been possible for a few queued cells to get relayed,
+      even though they would have been immediately dropped by the next
+      OR in the circuit. Fixes bug 1184; bugfix on 0.2.0.1-alpha.
+    - Never queue a cell for a circuit that's already been marked
+      for close.
+    - Never vote for a server as "Running" if we have a descriptor for
+      it claiming to be hibernating, and that descriptor was published
+      more recently than our last contact with the server. Bugfix on
+      0.2.0.3-alpha; fixes bug 911.
+    - Squash a compile warning on OpenBSD. Reported by Tas; fixes
+      bug 1848.
+
+  o Minor bugfixes (on 0.2.2.x):
+    - Fix a regression introduced in 0.2.2.7-alpha that marked relays
+      down if a directory fetch fails and you've configured either
+      bridges or EntryNodes. The intent was to mark the relay as down
+      _unless_ you're using bridges or EntryNodes, since if you are
+      then you could quickly run out of entry points.
     - Fix the Windows directory-listing code. A bug introduced in
       0.2.2.14-alpha could make Windows directory servers forget to load
       some of their cached v2 networkstatus files.
-
-  o Minor bugfixes (compile fixes):
-    - Squash a compile warning on OpenBSD. Reported by Tas; fixes
-      bug 1848.
-    - When building with --enable-gcc-warnings on OpenBSD, disable
-      warnings in system headers. This makes --enable-gcc-warnings
-      pass on OpenBSD 4.8.
+    - Really allow clients to use relays as bridges. Fixes bug 1776;
+      bugfix on 0.2.2.15-alpha.
+    - Demote a warn to info that happens when the CellStatistics option
+      was just enabled. Bugfix on 0.2.2.15-alpha; fixes bug 1921.
+      Reported by Moritz Bartl.
     - On Windows, build correctly either with or without Unicode support.
       This is necessary so that Tor can support fringe platforms like
       Windows 98 (which has no Unicode), or Windows CE (which has no
-      non-Unicode). Bugfix on 0.2.2.14-alpha. Fixes bug 1797.
+      non-Unicode). Bugfix on 0.2.2.14-alpha; fixes bug 1797.
 
   o Testing
     - Add a unit test for cross-platform directory-listing code.
diff --git a/changes/bug1184 b/changes/bug1184
deleted file mode 100644
index 856cdc644d..0000000000
--- a/changes/bug1184
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Never relay a cell for a circuit we have already destroyed.
-      Between marking a circuit as closeable and finally closing it,
-      it may have been possible for a few queued cells to get relayed,
-      even though they would have been immediately dropped by the next
-      OR in the circuit.  Fix 1184; bugfix on 0.2.0.1-alpha.
-    - Never queue a cell for a circuit that's already been marked
-      for close.
-
diff --git a/changes/bug1776_v3 b/changes/bug1776_v3
deleted file mode 100644
index 18d51856ee..0000000000
--- a/changes/bug1776_v3
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Really allow clients to use relays as bridges. Fixes bug 1776;
-      bugfix on 0.2.2.15-alpha.
diff --git a/changes/bug1899_test_changed_addr b/changes/bug1899_test_changed_addr
deleted file mode 100644
index 2823d3c6e0..0000000000
--- a/changes/bug1899_test_changed_addr
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features
-    - When a router changes IP or port, authorities now launch a new
-      reachability test for it.  (Implements ticket 1899)
-
diff --git a/changes/bug1921 b/changes/bug1921
deleted file mode 100644
index 751216339d..0000000000
--- a/changes/bug1921
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Demote a warn to info that happens when the CellStatistics option
-      was just enabled. Fixes bug 1921; bugfix on 0.2.2.15-alpha. Reported
-      by Moritz Bartl.
diff --git a/changes/bug1937 b/changes/bug1937
deleted file mode 100644
index b1fed6b2be..0000000000
--- a/changes/bug1937
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Major bugfixes
-    - When receiving a circuit-level SENDME for a blocked circuit, try
-      to package cells fairly from all the streams that had previously
-      been blocked on that circuit.  Previously, we had started with
-      the oldest stream, and allowed each stream to potentially
-      exhaust the circuit's package window.  This gave older streams
-      on any given circuit priority over newer ones.  Fixes bug 1937.
-      Detected by Camilo Viecco.  This bug was introduced before the
-      first Tor release, in svn commit r152: it is the new winner of
-      the longest-lived bug prize.
diff --git a/changes/bug1947 b/changes/bug1947
deleted file mode 100644
index 598a3d20dc..0000000000
--- a/changes/bug1947
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor features:
-    - Add new "perconnbwrate" and "perconnbwburst" consensus params to
-      do individual connection-level rate limiting of clients. The torrc
-      config options with the same names trump the consensus params, if
-      both are present. Replaces the old "bwconnrate" and "bwconnburst"
-      consensus params which were broken from 0.2.2.7-alpha through
-      0.2.2.14-alpha. Closes bug 1947.
diff --git a/changes/bug911_hibernate_precludes_Running b/changes/bug911_hibernate_precludes_Running
deleted file mode 100644
index 5e0168d545..0000000000
--- a/changes/bug911_hibernate_precludes_Running
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Never vote for a server as "Running" if we have a descriptor for it
-      claiming to be hibernating, and that descriptor was published more
-      recently than our last contact with the server.  Bugfix on
-      0.2.0.3-alpha; fixes bug 911.
-
diff --git a/changes/prettier-signature-log b/changes/prettier-signature-log
deleted file mode 100644
index c008514fb9..0000000000
--- a/changes/prettier-signature-log
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor features
-    - Make the formerly ugly "2 unknown, 7 missing key, 0 good, 0 bad,
-      2 no signature, 4 required" messages easier to read, and make sure
-      they get logged at the same severity as the messages explaining
-      which keys are which.  Fixes bug 1290.
-    - Don't warn when we have a consensus that we can't verify because
-      of missing certificates, unless those certificates are ones
-      that we have been trying and failing to download.  Fixes bug 1145.
-