fold in changes entries

12 files changed, 37 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a374803ca..2647723970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,12 +2,39 @@ Changes in version 0.2.4.18-rc - 2013-10-??
   Tor 0.2.4.18-rc is the fourth release candidate for the Tor 0.2.4.x
   series. [...]
 
-  o Minor bugfixes:
+  o Major bugfixes:
+    - Stop trying to bootstrap all our directory information from
+      only our first guard. Discovered while fixing bug 9946; bugfix
+      on 0.2.4.8-alpha.
+
+  o Minor bugfixes (on 0.2.4.x):
+    - Correctly log long IPv6 exit policies, instead of truncating them
+      or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha.
+    - Free directory authority certificate download statuses on exit
+      rather than leaking them. Fixes bug 9644; bugfix on 0.2.4.13-alpha.
     - Always call circuit_n_chan_done(chan, 0) from channel_closed(),
       so we can't leak pending circuits in some cases where
       run_connection_housekeeping() calls connection_or_close_normally().
       Fixes bug 9776; bugfix on 0.2.4.17.
 
+  o Minor bugfixes (on 0.2.3.x and earlier):
+    - 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.
+    - 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.
+    - When examining the 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".
+    - 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 features:
     - Clients no longer send timestamps in their NETINFO cells. These were
       not used for anything, and they provided one small way for clients
@@ -22,7 +49,15 @@ Changes in version 0.2.4.18-rc - 2013-10-??
       good purpose, and isn't needed. Implements part of proposal 222.
     - Reduce down accuracy of timestamps in hidden service descriptors.
       Implements part of proposal 222.
-    - Update to the September 4 2013 Maxmind GeoLite Country database.
+    - Generate bootstrapping status update events correctly when fetching
+      microdescriptors. Fixes bug 9927.
+    - Add anchors to the manpage so we can link to the html version of
+      the documentation for specific options. Resolves ticket 9866.
+    - Update to the October 2 2013 Maxmind GeoLite Country database.
+
+  o Documentation fixes:
+    - Clarify the usage and risks of setting the ContactInfo torrc line
+      for your relay or bridge. Resolves ticket 9854.
 
 
 Changes in version 0.2.4.17-rc - 2013-09-05
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/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/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/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.