fold in changes entries

4 files changed, 27 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 1faa2b00a6..98f1d63128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+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:
+    - 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 features:
+    - Clients no longer send timestamps in their NETINFO cells. These were
+      not used for anything, and they provided one small way for clients
+      to be distinguished from each other as they moved from network to
+      network or behind NAT. Implements part of proposal 222.
+    - Clients now round timestamps in INTRODUCE cells down to the nearest
+      10 minutes. If a new Support022HiddenServices option is set to 0, or
+      if it's set to "auto" and the feature is disabled in the consensus,
+      the timestamp is sent as 0 instead. Implements part of proposal 222.
+    - Stop sending timestamps in AUTHENTICATE cells. This is not such
+      a big deal from a security point of view, but it achieves no actual
+      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.
+
+
 Changes in version 0.2.4.17-rc - 2013-09-05
   Tor 0.2.4.17-rc is the third release candidate for the Tor 0.2.4.x
   series. It adds an emergency step to help us tolerate the massive
diff --git a/changes/bug9776 b/changes/bug9776
deleted file mode 100644
index ea3a96abb3..0000000000
--- a/changes/bug9776
+++ /dev/null
@@ -1,5 +0,0 @@
-   o Normal bugfixes:
-     - 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.
diff --git a/changes/geoip-september2013 b/changes/geoip-september2013
deleted file mode 100644
index 0173f4cfe3..0000000000
--- a/changes/geoip-september2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the September 4 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/no_client_timestamps_024 b/changes/no_client_timestamps_024
deleted file mode 100644
index 41dea2f1a6..0000000000
--- a/changes/no_client_timestamps_024
+++ /dev/null
@@ -1,14 +0,0 @@
-  o Minor features (security, timestamp avoidance, proposal 222):
-    - Clients no longer send timestamps in their NETINFO cells.  These were
-      not used for anything, and they provided one small way for clients
-      to be distinguished from each other as they moved from network to
-      network or behind NAT. Implements part of proposal 222.
-    - Clients now round timestamps in INTRODUCE cells down to the nearest
-      10 minutes.  If a new Support022HiddenServices option is set to 0,
-      or if it's set to "auto" and the feature is disabled in the consensus,
-      the timestamp is sent as 0 instead. Implements part of proposal 222.
-    - Stop sending timestamps in AUTHENTICATE cells. This is not such
-      a big deal from a security point of view, but it achieves no actual
-      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.