merge changes files for upcoming release

14 files changed, 73 insertions, 75 deletions

diff --git a/ChangeLog b/ChangeLog
index a7a9278d37..f6f23d4a6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,76 @@
+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 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
+      some cases. We fix this by not re-enabling reading on receipt of a
+      sendme cell when the cell queue is blocked. Fixes bug 1653. Bugfix
+      on 0.2.0.1-alpha. Detected by Mashael AlSabah. Original patch by
+      "yetonetime".
+    - Newly created streams were allowed to read cells onto circuits,
+      even if the circuit's cell queue was blocked and waiting to drain.
+      This created potential unfairness, as older streams would be
+      blocked, but newer streams would gladly fill the queue completely.
+      We add code to detect this situation and prevent any stream from
+      getting more than one free cell. Bugfix on 0.2.0.1-alpha. Partially
+      fixes bug 1298.
+
+  o Minor features:
+    - Update to the September 1 2010 Maxmind GeoLite Country database.
+    - Warn when CookieAuthFileGroupReadable is set but CookieAuthFile is
+      not. This would lead to a cookie that is still not group readable.
+      Closes bug 1843. Suggested by katmagic.
+    - When logging a rate-limited warning, we now mention how many messages
+      got suppressed since the last warning.
+
+  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.
+    - 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
+      it means authorities that didn't agree with the current consensus
+      will still fetch and serve it if it has enough signatures. Bugfix
+      on 0.2.0.9-alpha; fixes bug 1300.
+    - Ensure DNS requests launched by "RESOLVE" commands from the
+      controller respect the __LeaveStreamsUnattached setconf options. The
+      same goes for requests launched via DNSPort or transparent
+      proxying. Bugfix on 0.2.0.1-alpha; fixes bug 1525.
+    - Allow handshaking OR connections to take a full KeepalivePeriod
+      seconds to handshake. Previously, we would close them after
+      IDLE_OR_CONN_TIMEOUT (180) seconds, the same timeout as if they
+      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.
+    - 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.
+    - 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.
+
+  o Testing
+    - Add a unit test for cross-platform directory-listing code.
+
+
 Changes in version 0.2.2.15-alpha - 2010-08-18
   o Major bugfixes:
     - Stop assigning the HSDir flag to relays that disable their
diff --git a/changes/1a65bdd2-regression b/changes/1a65bdd2-regression
deleted file mode 100644
index 0a7436d812..0000000000
--- a/changes/1a65bdd2-regression
+++ /dev/null
@@ -1,6 +0,0 @@
-  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.
diff --git a/changes/bug1138 b/changes/bug1138
deleted file mode 100644
index ffb83bd4be..0000000000
--- a/changes/bug1138
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Fall back to direct descriptor request to bridges when
-      requests to authorities fail due to a network error.
-      Bugfix in 0.2.1.19, closes bug 1138.
-
diff --git a/changes/bug1300_alt b/changes/bug1300_alt
deleted file mode 100644
index d88023ffa7..0000000000
--- a/changes/bug1300_alt
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes
-    - Authorities will now attempt to download consensuses when they
-      are sure that their own efforts to get a live consensus have
-      failed.  Bugfix on 0.2.0.9-alpha.  Fixes bug 1300.
diff --git a/changes/bug1525 b/changes/bug1525
deleted file mode 100644
index b0d9ac6f46..0000000000
--- a/changes/bug1525
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Ensure DNS requests launched by "RESOLVE" commands from the controller
-      respect __LeaveStreamsUnattached. The same goes for requests launched
-      via DNSPort or transparent proxying. Bugfix on 0.2.0.1-alpha; fixes bug
-      1525.
diff --git a/changes/bug1653 b/changes/bug1653
deleted file mode 100644
index ecb0b70f1d..0000000000
--- a/changes/bug1653
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes:
-    - When the exit relay gets a circuit-level sendme cell, it started
-      reading on the exit streams, even if had 500 cells queued in our
-      circuit queue already, so our circuit queue just grew and grew
-      in some cases.  We fix this by not re-enabling reading on SENDME
-      while the cell queue is blocked.  Fixes bug 1653.  Bugfix on
-      0.2.0.1-alpha.  Detected by Mashael AlSabah.  Original patch by
-      "yetonetime".
diff --git a/changes/bug1840 b/changes/bug1840
deleted file mode 100644
index 0ef2b98a3f..0000000000
--- a/changes/bug1840
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes:
-    - Allow handshaking OR connections to take a full KeepalivePeriod
-      seconds to handshake.  Previously, we would close them after
-      IDLE_OR_CONN_TIMEOUT seconds, as if they were open.  This is a
-      bugfix on 0.2.1.26.  Thanks to mingw-san for analysis help.  Fixes
-      bug 1840.
-
diff --git a/changes/bug1843 b/changes/bug1843
deleted file mode 100644
index f44054ee22..0000000000
--- a/changes/bug1843
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Warn when CookieAuthFileGroupReadable is set but CookieAuthFile is
-      not. This would lead to a cookie that is still not group readable.
-      Closes bug 1843. Suggested by katmagic.
diff --git a/changes/bug1848 b/changes/bug1848
deleted file mode 100644
index db00e17f83..0000000000
--- a/changes/bug1848
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Squash a compile warning on OpenBSD. Reported by Tas, fixes bug 1848.
-
diff --git a/changes/detect-full-queues b/changes/detect-full-queues
deleted file mode 100644
index c00e3ea8cc..0000000000
--- a/changes/detect-full-queues
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes:
-    - Newly created streams were allowed to read cells onto circuits,
-      even if the circuit's cell queue was blocked and waiting to drain.
-      This created potential unfairness, as older streams would be
-      blocked, but newer streams would gladly fill the queue completely.
-      We add code to detect this situation and prevent any stream from
-      getting more than one free cell.  Bugfix on 0.2.0.1-alpha.
-      Possible partial fix for bug 1298.
diff --git a/changes/geoip-sep2010 b/changes/geoip-sep2010
deleted file mode 100644
index 47eb00699c..0000000000
--- a/changes/geoip-sep2010
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the September 1 2010 Maxmind GeoLite Country database.
-
diff --git a/changes/log-ratelim b/changes/log-ratelim
deleted file mode 100644
index 612a510fdf..0000000000
--- a/changes/log-ratelim
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes
-    - Rate-limit "Failed to hand off onionskin" warnings.
-
-  o Minor features
-    - When logging a rate-limited warning, we now mention how many messages
-      got suppressed since the last warning.
-
diff --git a/changes/openbsd-sysheaders b/changes/openbsd-sysheaders
deleted file mode 100644
index 2babde2d78..0000000000
--- a/changes/openbsd-sysheaders
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When building with --enable-gcc-warnings on OpenBSD, disable
-      warnings in system headers.  This makes --enable-gcc-warnings
-      pass on OpenBSD 4.8.
\ No newline at end of file
diff --git a/changes/win32_unicode b/changes/win32_unicode
deleted file mode 100644
index f64a22f810..0000000000
--- a/changes/win32_unicode
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Minor bugfixes
-    - 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.
-    - 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 Testing
-    - Add a unit test for cross-platform directory-listing code.