Move all merged-in-0.2.4.18-rc items into 0.2.5.2-alpha changelog section.

16 files changed, 86 insertions, 75 deletions

diff --git a/ChangeLog b/ChangeLog
index 0863b61c45..c9ed9fdc31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,89 @@
+Changes in version 0.2.5.2 - 2013-01-??
+
+ALSO IN 0.2.4.18-rc
+  o Major bugfixes:
+    - Do not apply connection_consider_empty_read/write_buckets to
+      non-rate-limited connections.
+  o Documentation:
+    - Add anchors to the manpage so we can link to the documentation for
+      specific options. Resolves ticket 9866.
+  o Documentation fixes:
+    - Clarify the usage and risks of ContactInfo. Resolves ticket 9854.
+
+  o Documentation:
+    - Replace remaining references to DirServer in man page and
+      log entries. Resolves ticket 10124.
+  o Minor bugfixes:
+    - Fix an assertion failure that would occur when disabling the
+      ORPort setting on a running Tor process while accounting was
+      enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha.
+  o Minor features:
+    - Improve the circuit queue out-of-memory handler. Previously, when
+      we ran low on memory, we'd close whichever circuits had the most
+      queued cells. Now, we close those that have the *oldest* queued
+      cells, on the theory that those are most responsible for us
+      running low on memory. Based on analysis from a forthcoming paper
+      by Jansen, Tschorsch, Johnson, and Scheuermann. Fixes bug 9093.
+  o Minor bugfixes:
+    - Correctly log long IPv6 exit policy, instead of truncating them
+      or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha.
+  o Minor bugfixes:
+    - Fix a small memory leak on exit. (We weren't freeing directory
+      authority certificate download statuses.) Fixes bug 9644; bugfix
+      on 0.2.4.13-alpha.
+  o Minor bugfixes (performance, fingerprinting):
+    - Our default TLS ecdhe groups were backwards: we meant to be using
+      P224 for relays (for performance win) and P256 for bridges (since
+      it is more common in the wild). Instead we had it backwards. After
+      reconsideration, we decided that the default should be P256 on all
+      hosts, since its security is probably better, and since P224 is
+      reportedly used quite little in the wild.  Found by "skruffy" on
+      IRC. Fix for bug 9780; bugfix on 0.2.4.8-alpha.
+  o Minor bugfixes:
+    - When closing a channel that has already been open, do not close
+      pending circuits that were waiting to connect to the same relay.
+      Fixes bug 9880; bugfix on 0.2.5.1-alpha. Thanks to skruffy for
+      finding this bug.  (Bug was merged to 0.2.4 branch but not released
+      in any 0.2.4 version)
+  o Minor bugfixes:
+    - When examining list of network interfaces to find our address, do
+      not consider non-running or disabled network interfaces. Fixes bug
+      9904; bugfix on 0.2.3.11-alpha. Patch from "hantwister".
+  o Minor features:
+    - Generate bootstrapping status update events correctly for fetching
+      microdescriptors. Fixes bug 9927.
+  o Minor bugfixes:
+    - Avoid an off-by-one error when checking buffer boundaries when
+      formatting the exit status of a pluggable transport helper.
+      This is probably not an exploitable bug, but better safe than
+      sorry. Fixes bug 9928; bugfix on 0.2.3.18-rc. Bug found by
+      Pedro Ribeiro.
+  o Minor bugfixes:
+    - If the guard we choose first doesn't answer, we would try the
+      second guard, but once we connected to the second guard we would
+      abandon it and retry the first one, slowing down bootstrapping.
+      The fix is to treat all our initially chosen guards as acceptable
+      to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha.
+
+  o Major bugfixes:
+    - Stop trying to fetch all our directory information from our first
+      guard. Discovered while fixing bug 9946; bugfix on 0.2.4.8-alpha.
+
+  o Minor features:
+    - Update to the October 2 2013 Maxmind GeoLite Country database.
+==============================
+ALSO IN 0.2.4.19:
+
+
+==============================
+ALSO IN 0.2.4.20:
+
+
+
+
+==============================
+
+
 Changes in version 0.2.4.20 - 2013-12-22
   Tor 0.2.4.20 fixes potentially poor random number generation for users
   who 1) use OpenSSL 1.0.0 or later, 2) set "HardwareAccel 1" in their
diff --git a/changes/9854 b/changes/9854
deleted file mode 100644
index 30105cb731..0000000000
--- a/changes/9854
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation fixes:
-    - Clarify the usage and risks of ContactInfo. Resolves ticket 9854.
-
diff --git a/changes/bug10124 b/changes/bug10124
deleted file mode 100644
index 95b0838839..0000000000
--- a/changes/bug10124
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Replace remaining references to DirServer in man page and
-      log entries. Resolves ticket 10124.
diff --git a/changes/bug6979 b/changes/bug6979
deleted file mode 100644
index 55572ecbac..0000000000
--- a/changes/bug6979
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix an assertion failure that would occur when disabling the
-      ORPort setting on a running Tor process while accounting was
-      enabled. Fixes bug 6979; bugfix on 0.2.2.18-alpha.
diff --git a/changes/bug9093 b/changes/bug9093
deleted file mode 100644
index 06b6cb926a..0000000000
--- a/changes/bug9093
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor features:
-    - Improve the circuit queue out-of-memory handler. Previously, when
-      we ran low on memory, we'd close whichever circuits had the most
-      queued cells. Now, we close those that have the *oldest* queued
-      cells, on the theory that those are most responsible for us
-      running low on memory. Based on analysis from a forthcoming paper
-      by Jansen, Tschorsch, Johnson, and Scheuermann. Fixes bug 9093.
\ No newline at end of file
diff --git a/changes/bug9596 b/changes/bug9596
deleted file mode 100644
index b3d138ecdc..0000000000
--- a/changes/bug9596
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Correctly log long IPv6 exit policy, instead of truncating them
-      or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha.
-
diff --git a/changes/bug9644 b/changes/bug9644
deleted file mode 100644
index 51c58a5fff..0000000000
--- a/changes/bug9644
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix a small memory leak on exit. (We weren't freeing directory
-      authority certificate download statuses.) Fixes bug 9644; bugfix
-      on 0.2.4.13-alpha.
diff --git a/changes/bug9731 b/changes/bug9731
deleted file mode 100644
index 11bbc6ab65..0000000000
--- a/changes/bug9731
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major bugfixes:
-    - Do not apply connection_consider_empty_read/write_buckets to
-      non-rate-limited connections.
diff --git a/changes/bug9780 b/changes/bug9780
deleted file mode 100644
index 3cb51bd528..0000000000
--- a/changes/bug9780
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes (performance, fingerprinting):
-    - Our default TLS ecdhe groups were backwards: we meant to be using
-      P224 for relays (for performance win) and P256 for bridges (since
-      it is more common in the wild). Instead we had it backwards. After
-      reconsideration, we decided that the default should be P256 on all
-      hosts, since its security is probably better, and since P224 is
-      reportedly used quite little in the wild.  Found by "skruffy" on
-      IRC. Fix for bug 9780; bugfix on 0.2.4.8-alpha.
diff --git a/changes/bug9880 b/changes/bug9880
deleted file mode 100644
index a7dda8f82f..0000000000
--- a/changes/bug9880
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes:
-
-    - When closing a channel that has already been open, do not close
-      pending circuits that were waiting to connect to the same relay.
-      Fixes bug 9880; bugfix on 0.2.5.1-alpha. Thanks to skruffy for
-      finding this bug.  (Bug was merged to 0.2.4 branch but not released
-      in any 0.2.4 version)
-
diff --git a/changes/bug9904 b/changes/bug9904
deleted file mode 100644
index eec4144cce..0000000000
--- a/changes/bug9904
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When examining list of network interfaces to find our address, do
-      not consider non-running or disabled network interfaces. Fixes bug
-      9904; bugfix on 0.2.3.11-alpha. Patch from "hantwister".
diff --git a/changes/bug9927 b/changes/bug9927
deleted file mode 100644
index e66280c3c4..0000000000
--- a/changes/bug9927
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Generate bootstrapping status update events correctly for fetching
-      microdescriptors. Fixes bug 9927.
-
diff --git a/changes/bug9928 b/changes/bug9928
deleted file mode 100644
index b72cea3d87..0000000000
--- a/changes/bug9928
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Avoid an off-by-one error when checking buffer boundaries when
-      formatting the exit status of a pluggable transport helper.
-      This is probably not an exploitable bug, but better safe than
-      sorry. Fixes bug 9928; bugfix on 0.2.3.18-rc. Bug found by
-      Pedro Ribeiro.
diff --git a/changes/bug9946 b/changes/bug9946
deleted file mode 100644
index 5d1c888743..0000000000
--- a/changes/bug9946
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Minor bugfixes:
-    - If the guard we choose first doesn't answer, we would try the
-      second guard, but once we connected to the second guard we would
-      abandon it and retry the first one, slowing down bootstrapping.
-      The fix is to treat all our initially chosen guards as acceptable
-      to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha.
-
-  o Major bugfixes:
-    - Stop trying to fetch all our directory information from our first
-      guard. Discovered while fixing bug 9946; bugfix on 0.2.4.8-alpha.
-
diff --git a/changes/geoip-october2013 b/changes/geoip-october2013
deleted file mode 100644
index bc72850725..0000000000
--- a/changes/geoip-october2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the October 2 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/ticket9866 b/changes/ticket9866
deleted file mode 100644
index 6cbb1110db..0000000000
--- a/changes/ticket9866
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Add anchors to the manpage so we can link to the documentation for 
-      specific options. Resolves ticket 9866.