fold in changes files for 0.2.1.31

13 files changed, 46 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index beb2dff193..a2f00d7393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+Changes in version 0.2.1.31 - 2011-05-??
+  o Major bugfixes (also included in 0.2.2.x):
+    - Avoid linkability based on cached hidden service descriptors: forget
+      all hidden service descriptors cached as a client when processing a
+      SIGNAL NEWNYM command. Fixes bug 3000; bugfix on 0.0.6.
+    - Make the bridge directory authority refuse to answer directory
+      requests for "all" descriptors. It used to include bridge
+      descriptors in its answer, which was a major information leak.
+      Found by "piebeer". Bugfix on 0.2.0.3-alpha.
+    - Fix an assert in parsing router descriptors containing IPv6
+      addresses. This one took down the directory authorities when
+      somebody tried some experimental code. Bugfix on 0.2.1.3-alpha.
+
+  o Minor bugfixes (also included in 0.2.2.x):
+    - When we restart our relay, we might get a successful connection
+      from the outside before we've started our reachability tests,
+      triggering a warning: "ORPort found reachable, but I have no
+      routerinfo yet. Failing to inform controller of success." This
+      bug was harmless unless Tor is running under a controller
+      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.
+    - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned.
+      None of the cases where we did this before were wrong, but by making
+      this change we avoid warnings. Fixes bug 2475; bugfix on 0.2.1.28.
+    - Fix a rare crash bug that could occur when a client was configured
+      with a large number of bridges. Fixes bug 2629; bugfix on
+      0.2.1.2-alpha. Bugfix by trac user "shitlei".
+    - Correct the warning displayed when a rendezvous descriptor exceeds
+      the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found by
+      John Brooks.
+    - Fix an uncommon assertion failure when running with DNSPort under
+      heavy load. Fixes bug 2933; bugfix on 0.2.0.1-alpha.
+    - When warning about missing zlib development packages during compile,
+      give the correct package names. Bugfix on 0.2.0.1-alpha.
+
+  o Minor bugfixes (only in 0.2.1.x):
+    - Resume using micro-version numbers in 0.2.1.x: our Debian packages
+      rely on them. Bugfix on 0.2.1.30.
+    - Use git revisions instead of svn revisions when generating our
+      micro-version numbers. Bugfix on 0.2.1.15-rc; fixes bug 2402.
+
+  o Minor features:
+    - Update to the April 1 2011 Maxmind GeoLite Country database.
+
+
 Changes in version 0.2.1.30 - 2011-02-23
   Tor 0.2.1.30 fixes a variety of less critical bugs. The main other
   change is a slight tweak to Tor's TLS handshake that makes relays
diff --git a/changes/all_descs b/changes/all_descs
deleted file mode 100644
index 10711b2621..0000000000
--- a/changes/all_descs
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes (bridge authority)
-    - Do not allow encrypte requests for "all" bridges to return all
-      bridges.
-
diff --git a/changes/bug1172 b/changes/bug1172
deleted file mode 100644
index 3abd7437f5..0000000000
--- a/changes/bug1172
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-    - When we restart our relay, we might get a successful connection
-      from the outside before we've started our reachability tests,
-      triggering a warning: "ORPort found reachable, but I have no
-      routerinfo yet. Failing to inform controller of success." This
-      bug was harmless unless Tor is running under a controller
-      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.
diff --git a/changes/bug2402_redux b/changes/bug2402_redux
deleted file mode 100644
index 84be04a021..0000000000
--- a/changes/bug2402_redux
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes
-    - Use micro-revision numbers in 0.2.1.x instead: apparently, they
-      were more used than we had known.  (Bugfix on 0.2.1.30).
-    - Instead of generating our micro-version numbers using SVN revisions,
-      use git revisions instead.  Bugfix on 0.2.1.15-rc; fixes bug 2402.
-
diff --git a/changes/bug2475 b/changes/bug2475
deleted file mode 100644
index d6f0595a59..0000000000
--- a/changes/bug2475
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Avoid signed/unsigned comparisons by making SIZE_T_CEILING unsigned.
-      (None of the cases where we did this before were wrong, but by making
-      this change we can avoid warnings.)  Fixes bug2475; bugfix on
-      Tor 0.2.1.28.
diff --git a/changes/bug2629 b/changes/bug2629
deleted file mode 100644
index 87817cf6e3..0000000000
--- a/changes/bug2629
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes
-    - Fix a crash bug that could occur occasionally when a client was
-      configured with a large number of bridges.  Fixes bug 2629; bugfix
-      on 0.2.1.2-alpha.  Bugfix by trac user "shitlei".
-
diff --git a/changes/bug2750 b/changes/bug2750
deleted file mode 100644
index 4371a0a4ee..0000000000
--- a/changes/bug2750
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes
-    - Correct the warning displayed when a rendezvous descriptor exceeds
-      the maximum size.  Fixes bug 2750; bugfix on 0.2.1.5-alpha.  Found
-      by John Brooks.
-
-
diff --git a/changes/bug2933 b/changes/bug2933
deleted file mode 100644
index 7aaf526112..0000000000
--- a/changes/bug2933
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes
-    - Fix an uncommon assertion failure when running with DNSPort under
-      heavy load.  Fixes bug 2933; bugfix on 2.0.1-alpha.
-
diff --git a/changes/forget-rend-descs-on-newnym b/changes/forget-rend-descs-on-newnym
deleted file mode 100644
index ab2fd61f34..0000000000
--- a/changes/forget-rend-descs-on-newnym
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Security fixes:
-    - Forget all hidden service descriptors cached as a client when
-      processing a SIGNAL NEWNYM command.  Fixes bug 3000.  Bugfix on
-      0.0.6.
-  o Code simplifications and refactoring:
-    - Allow rend_client_send_introduction to fail without closing the
-      AP connection permanently.
-
-
diff --git a/changes/geoip-apr2011 b/changes/geoip-apr2011
deleted file mode 100644
index c38f8ae384..0000000000
--- a/changes/geoip-apr2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the April 1 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-mar2011 b/changes/geoip-mar2011
deleted file mode 100644
index fda927f03f..0000000000
--- a/changes/geoip-mar2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the March 1 2011 Maxmind GeoLite Country database.
-
diff --git a/changes/ipv6_crash b/changes/ipv6_crash
deleted file mode 100644
index 02f8aaa41c..0000000000
--- a/changes/ipv6_crash
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Fix a crash in parsing router descriptors containing IPv6
-      addresses.  This one crashed the directory authorities when somebody
-      fired up some experimental code. Bugfix on 0.2.1.3-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.