fold in some more changes entries

7 files changed, 26 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 42d4e149fe..12daf866a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,23 @@ Changes in version 0.2.2.28-beta - 2011-05-3?
       consensus periodically. Fixes the most common case of triggering
       bug 1810; bugfix on 0.2.2.7-alpha.
     - Actually allow nameservers with IPv6 addresses. Fixes bug 2574.
+    - Don't try to build descriptors if "ORPort auto" is set and we
+      don't know our actual ORPort yet. Fix for bug 3216; bugfix on
+      0.2.2.26-beta.
+    - Resolve a crash that occured when setting BridgeRelay to 1 with
+      accounting enabled. Fixes bug 3228; bugfix on 0.2.2.18-alpha.
+    - Apply circuit timeouts to opened hidden-service-related circuits
+      based on the correct start time. Previously, we would apply the
+      circuit build timeout based on time since the circuit's creation;
+      it was supposed to be applied based on time since the circuit
+      entered its current state. Bugfix on 0.0.6; fixes part of bug 1297.
+    - Use the same circuit timeout for client-side introduction
+      circuits as for other four-hop circuits, rather than the timeout
+      for single-hop directory-fetch circuits; the shorter timeout may
+      have been appropriate with the static circuit build timeout in
+      0.2.1.x and earlier, but caused many hidden service access attempts
+      to fail with the adaptive CBT introduced in 0.2.2.2-alpha. Bugfix
+      on 0.2.2.2-alpha; fixes another part of bug 1297.
 
   o Major features:
     - Add an __OwningControllerProcess configuration option and a
@@ -16,11 +33,20 @@ Changes in version 0.2.2.28-beta - 2011-05-3?
     - Remove a trailing asterisk from "exit-policy/default" in the
       output of the control port command "GETINFO info/names". Bugfix
       on 0.1.2.5-alpha.
+    - Use a wide type to hold sockets when built for 64-bit Windows builds.
+      Fixes bug 3270.
+    - Warn when the user configures two HiddenServiceDir lines that point
+      to the same directory. Bugfix on 0.0.6 (the version introducing
+      HiddenServiceDir); fixes bug 3289.
 
   o Minor features:
     - Relays now log the reason for publishing a new relay descriptor,
       so we have a better chance of hunting down instances of bug 1810.
       Resolves ticket 3252.
+    - Revise most log messages that refer to nodes by nickname to
+      instead use the "$key=nickname at address" format. This should be
+      more useful, especially since nicknames are less and less likely
+      to be unique. Resolves ticket 3045.
 
   o Removed options:
     - Remove undocumented option "-F" from tor-resolve: it hasn't done
diff --git a/changes/bug1297a b/changes/bug1297a
deleted file mode 100644
index 140b94e3b0..0000000000
--- a/changes/bug1297a
+++ /dev/null
@@ -1,16 +0,0 @@
-  o Major bugfixes:
-    - Apply circuit timeouts to opened hidden-service-related circuits
-      based on the correct start time.  Previously, we would apply the
-      circuit build timeout based on time since the circuit's
-      creation; it was supposed to be applied based on time since the
-      circuit entered its current state.  Bugfix on 0.0.6; fixes part
-      of bug 1297.
-    - Use the same circuit timeout for client-side introduction
-      circuits as for other four-hop circuits.  Previously,
-      client-side introduction circuits were closed after the same
-      timeout as single-hop directory-fetch circuits; this was
-      appropriate with the static circuit build timeout in 0.2.1.x and
-      earlier, but caused many hidden service access attempts to fail
-      with the adaptive CBT introduced in 0.2.2.2-alpha.  Bugfix on
-      0.2.2.2-alpha; fixes another part of bug 1297.
-
diff --git a/changes/bug3045 b/changes/bug3045
deleted file mode 100644
index 1cbcabaff6..0000000000
--- a/changes/bug3045
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features:
-    - Revise most log messages that refer to nodes by nickname to
-      instead use the "$key=nickname at address" format.  This should be
-      more useful, especially since nicknames are less and less likely
-      to be unique.  Fixes bug 3045.
-
diff --git a/changes/bug3216 b/changes/bug3216
deleted file mode 100644
index 599b5e162f..0000000000
--- a/changes/bug3216
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Don't try to build descriptors if "ORPort auto" is set and we
-      don't know our actual ORPort yet.  Fix for bug 3216; bugfix on
-      0.2.2.26-beta.
diff --git a/changes/bug3228 b/changes/bug3228
deleted file mode 100644
index 4aca810d3c..0000000000
--- a/changes/bug3228
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes:
-    - Resolve a crash that occured when setting BridgeRelay to 1 with
-      accounting enabled. Fixes bug 3228; bugfix on 0.2.2.18-alpha.
diff --git a/changes/bug3270 b/changes/bug3270
deleted file mode 100644
index b37bb983cc..0000000000
--- a/changes/bug3270
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes
-    - Use a wide type to hold sockets when built for 64-bit Windows builds.
-      Fixes bug 3270.
-
diff --git a/changes/bug3289 b/changes/bug3289
deleted file mode 100644
index c469796d6e..0000000000
--- a/changes/bug3289
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Warn when the user configures two HiddenServiceDir lines that point
-      to the same directory. Bugfix on 0.0.6 (the version introducing
-      HiddenServiceDir); fixes bug 3289.
-