fold in the changes files

9 files changed, 56 insertions, 60 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d229d0b4f..1b9e43abf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+Changes in version 0.2.2.29-beta - 2011-06-20
+  o Major bugfixes:
+    - Revert the UseBridges option to its behavior before 0.2.2.28-beta.
+      When we changed the default behavior to "use bridges if any
+      are listed in the torrc", we surprised users who had bridges
+      in their torrc files but who didn't actually want to use them.
+      Partial resolution for bug 3354.
+
+  o Privacy fixes:
+    - Don't attach new streams to old rendezvous circuits after SIGNAL
+      NEWNYM. Previously, we would keep using an existing rendezvous
+      circuit if it remained open (i.e. if it were kept open by a
+      long-lived stream, or if a new stream were attached to it before
+      Tor could notice that it was old and no longer in use). Bugfix on
+      0.1.1.15-rc; fixes bug 3375.
+
+  o Minor bugfixes:
+    - Fix a bug when using ControlSocketsGroupWritable with User. The
+      directory's group would be checked against the current group, not
+      the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix
+      on Tor 0.2.2.26-beta.
+    - Make connection_printf_to_buf()'s behaviour sane. Its callers
+      expect it to emit a CRLF iff the format string ends with CRLF;
+      it actually emitted a CRLF iff (a) the format string ended with
+      CRLF or (b) the resulting string was over 1023 characters long or
+      (c) the format string did not end with CRLF ''and'' the resulting
+      string was 1021 characters long or longer. Bugfix on 0.1.1.9-alpha;
+      fixes part of bug 3407.
+    - Make send_control_event_impl()'s behaviour sane. Its callers
+      expect it to always emit a CRLF at the end of the string; it
+      might have emitted extra control characters as well. Bugfix on
+      0.1.1.9-alpha; fixes another part of bug 3407.
+    - Make crypto_rand_int() check the value of its input correctly.
+      Previously, it accepted values up to UINT_MAX, but could return a
+      negative number if given a value above INT_MAX+1. Found by George
+      Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14.
+    - Avoid a segfault when reading a malformed circuit build state
+      with more than INT_MAX entries. Found by wanoskarnet. Bugfix on
+      0.2.2.4-alpha.
+    - When asked about a DNS record type we don't support via a
+      client DNSPort, reply with NOTIMPL rather than an empty
+      reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.
+    - Fix a rare memory leak during stats writing. Found by coverity.
+
+  o Minor features:
+    - Update to the June 1 2011 Maxmind GeoLite Country database.
+
+  o Code simplifications and refactoring:
+    - Remove some dead code as indicated by coverity.
+    - Remove a few dead assignments during router parsing. Found by
+      coverity.
+    - Add some forgotten return value checks during unit tests. Found
+      by coverity.
+    - Don't use 1-bit wide signed bit fields. Found by coverity.
+
+
 Changes in version 0.2.2.28-beta - 2011-06-04
   Tor 0.2.2.28-beta makes great progress towards a new stable release: we
   fixed a big bug in whether relays stay in the consensus consistently,
diff --git a/changes/abandon-rend-circs-on-newnym b/changes/abandon-rend-circs-on-newnym
deleted file mode 100644
index 67cb2dce2f..0000000000
--- a/changes/abandon-rend-circs-on-newnym
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Security fixes:
-    - Don't attach new streams to old rendezvous circuits after SIGNAL
-      NEWNYM.  Previously, we would keep using an existing rendezvous
-      circuit if it remained open (i.e. if it were kept open by a
-      long-lived stream or if a new stream were attached to it before
-      Tor could notice that it was old and no longer in use and close
-      it).  Bugfix on 0.1.1.15-rc; fixes bug 3375.
-
diff --git a/changes/bug2355_revert b/changes/bug2355_revert
deleted file mode 100644
index 2ded40ad8e..0000000000
--- a/changes/bug2355_revert
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes:
-    - Revert the UseBridges option to its behavior before 0.2.2.28-beta.
-      When we changed the default behavior to "use bridges if any are
-      listed in the torrc", we broke a number of users who had bridges
-      in their torrc files but who didn't actually want to use them.
-      Partial resolution for bug 3354.
-
diff --git a/changes/bug3306 b/changes/bug3306
deleted file mode 100644
index f868a24af0..0000000000
--- a/changes/bug3306
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - Make our crypto_rand_int() function check the value of its input
-      correctly. Previously, it accepted values up to UINT_MAX, but
-      could return a negative number if given a value above INT_MAX+1.
-      Found by George Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14.
-
-    - Avoid a segfault when reading a malformed circuit build state
-      with more than INT_MAX entries. Found by wanoskarnet. Bugfix on
-      0.2.2.4-alpha.
diff --git a/changes/bug3369 b/changes/bug3369
deleted file mode 100644
index 9c0d0e699a..0000000000
--- a/changes/bug3369
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When asked about a DNS record type we don't support via a
-      client DNSPort, reply with NOTIMPL rather than an empty
-      reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.
diff --git a/changes/bug3393 b/changes/bug3393
deleted file mode 100644
index 677bcb7be2..0000000000
--- a/changes/bug3393
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes:
-   - Fix a bug when using ControlSocketsGroupWritable with User. The
-     directory's group would be checked against the current group, not
-     the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix
-     on Tor 0.2.2.26-beta.
\ No newline at end of file
diff --git a/changes/coverity_maint b/changes/coverity_maint
deleted file mode 100644
index e7be90a485..0000000000
--- a/changes/coverity_maint
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Code simplifications and refactoring:
-    - Remove some dead code as indicated by coverity.
-    - Remove a few dead assignments during router parsing. Found by coverity.
-  o Minor bugfixes:
-    - Add some forgotten return value checks during unit tests. Found
-      by coverity.
-    - Don't use 1-bit wide signed bit fields. Found by coverity.
-    - Fix a rare memory leak during stats writing. Found by coverity.
-
diff --git a/changes/fix-connection_printf_to_buf b/changes/fix-connection_printf_to_buf
deleted file mode 100644
index e191eac8a5..0000000000
--- a/changes/fix-connection_printf_to_buf
+++ /dev/null
@@ -1,15 +0,0 @@
-  * Code simplifications and refactoring:
-
-    - Make connection_printf_to_buf's behaviour sane.  Its callers
-      expect it to emit a CRLF iff the format string ends with CRLF;
-      it actually emits a CRLF iff (a) the format string ends with
-      CRLF or (b) the resulting string is over 1023 characters long or
-      (c) the format string does not end with CRLF ''and'' the
-      resulting string is 1021 characters long or longer.  Bugfix on
-      0.1.1.9-alpha; fixes part of bug 3407.
-
-    - Make send_control_event_impl's behaviour sane.  Its callers
-      expect it to always emit a CRLF at the end of the string; it
-      might emit extra control characters as well.  Bugfix on
-      0.1.1.9-alpha; fixes another part of bug 3407.
-
diff --git a/changes/geoip-june2011 b/changes/geoip-june2011
deleted file mode 100644
index 8cf011b723..0000000000
--- a/changes/geoip-june2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the June 1 2011 Maxmind GeoLite Country database.
-