fold in the latest changes files

6 files changed, 26 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index a4935521e8..2698329c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,13 @@ Changes in version 0.2.2.23-alpha - 2011-02-??
       Instead, only inform the controller when it's a trusted authority
       that claims our clock is wrong. Bugfix on 0.1.2.6-alpha; fixes
       the rest of bug 1074.
+    - 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.
+    - 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.
     - If relays set RelayBandwidthBurst but not RelayBandwidthRate,
       Tor would ignore their RelayBandwidthBurst setting,
       potentially using more bandwidth than expected. Bugfix on
@@ -19,11 +26,20 @@ Changes in version 0.2.2.23-alpha - 2011-02-??
       so that they can determine their correct estimated bandwidth on
       restart. Resolves bug 1863, where Tor relays would reset their
       estimated bandwidth to 0 after restarting.
+    - Directory authorities now take changes in router IP address and
+      ORPort into account when determining router stability. Previously,
+      if a router changed its IP or ORPort, the authorities would not
+      treat it as having any downtime for the purposes of stability
+      calculation, whereas clients would experience downtime since the
+      change could take a while to propagate to them. Resolves issue 1035.
     - Enable Address Space Layout Randomization (ASLR) and Data Execution
       Prevention (DEP) by default on Windows to make it harder for
       attackers to exploit vulnerabilities. Patch from John Brooks.
 
   o Minor bugfixes (on 0.2.1.x and earlier):
+    - 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".
     - Avoid a double mark-for-free warning when failing to attach a
       transparent proxy connection. Bugfix on 0.1.2.1-alpha. Fixes
       bug 2279.
@@ -51,6 +67,16 @@ Changes in version 0.2.2.23-alpha - 2011-02-??
     - Fix a bug with our locking implementation on Windows that couldn't
       correctly detect when a file was already locked. Fixes bug 2504,
       bugfix on 0.2.1.6-alpha.
+    - Fix IPv6-related connect() failures on some platforms (BSD, OS X).
+      Bugfix on 0.2.0.3-alpha; fixes first part of bug 2660. Patch by
+      "piebeer".
+    - Set target port in get_interface_address6() correctly. Bugfix
+      on 0.1.1.4-alpha and 0.2.0.3-alpha; fixes second part of bug 2660.
+    - Directory authorities are now more robust to hops back in time
+      when calculating router stability. Previously, if a run of uptime
+      or downtime appeared to be negative, the calculation could give
+      incorrect results. Bugfix on 0.2.0.6-alpha; noticed when fixing
+      bug 1035.
 
   o Minor bugfixes (on 0.2.2.x):
     - Clients should not weight BadExit nodes as Exits in their node
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/bug1035 b/changes/bug1035
deleted file mode 100644
index 3d86330e63..0000000000
--- a/changes/bug1035
+++ /dev/null
@@ -1,13 +0,0 @@
-  o Minor features (authorities)
-    - Take altered router IP addresses and ORPorts into account when
-      determining router stability.  Previously, if a router changed
-      its IP or ORPort, the authorities would not treat it as having
-      any downtime for the purposes of stability calculation, whereas
-      clients would experience downtime since the change could take a
-      while to propagate to them.  Resolves issue 1035.
-  o Minor bugfixes (authorities)
-    - Try to be more robust to hops back in time when calculating
-      router stability.  Previously, if a run of uptime or downtime
-      appeared to be negative, the calculation could give incorrect
-      results.  Bugfix on 0.2.0.6-alpha.
-
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/bug2660 b/changes/bug2660
deleted file mode 100644
index 2aa06d36f5..0000000000
--- a/changes/bug2660
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes:
-    - Fix connect() failures on some platforms (BSD, OS X). Bugfix on
-      0.2.0.3-alpha; fixes first part of bug 2660. Patch by piebeer.
-    - Set target port in get_interface_address6() correctly. Bugfix
-      on 0.1.1.4-alpha and 0.2.0.3-alpha; fixes second part of bug
-      2660.
-
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.