fold in changes entries

7 files changed, 28 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index d0e1f776d2..95ce51975f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Changes in version 0.2.4.17-rc - 2013-09-0x
+  o Major bugfixes:
+    - Bridges now send AUTH_CHALLENGE cells during their v3 handshakes;
+      previously they did not, which prevented them from receiving
+      successful connections from relays for self-test or bandwidth
+      testing. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+    - When a relay is extending a circuit to a bridge, it needs to send a
+      NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
+      cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
+    - If the time to download the next old-style networkstatus is in
+      the future, do not decline to consider whether to download the
+      next microdescriptor networkstatus. Fixes bug 9564; bugfix on
+      0.2.3.14-alpha.
+
+  o Minor fixes (config options):
+    - Avoid overflows when the user sets MaxCircuitDirtiness to a
+      ridiculously high value, by imposing a (ridiculously high) 30-day
+      maximum on MaxCircuitDirtiness.
+    - Fix the documentation of HeartbeatPeriod to say that the heartbeat
+      message is logged at notice, not at info.
+    - Warn and fail if a server is configured not to advertise any
+      ORPorts at all. (We need *something* to put in our descriptor,
+      or we just won't work.)
+
+  o Minor features:
+    - Update to the August 7 2013 Maxmind GeoLite Country database.
+
+
 Changes in version 0.2.4.16-rc - 2013-08-10
   Tor 0.2.4.16-rc is the second release candidate for the Tor 0.2.4.x
   series. It fixes several crash bugs in the 0.2.4 branch.
diff --git a/changes/bug9366 b/changes/bug9366
deleted file mode 100644
index acc919e77f..0000000000
--- a/changes/bug9366
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (usability):
-    - Warn and fail if a server is configured not to advertise any
-      ORPorts at all. (We need *something* to put in our descriptor, or
-      we just won't work.)
diff --git a/changes/bug9543 b/changes/bug9543
deleted file mode 100644
index 753947f6fd..0000000000
--- a/changes/bug9543
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Avoid overflows when the user sets MaxCircuitDirtiness to a
-      ridiculously high value, by imposing a (ridiculously high) 30-day
-      maximum on MaxCircuitDirtiness.
diff --git a/changes/bug9546 b/changes/bug9546
deleted file mode 100644
index 2145e35d8f..0000000000
--- a/changes/bug9546
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Major bugfixes:
-
-    - When a relay is extending a circuit to a bridge, it needs to send a
-      NETINFO cell, even when the bridge hasn't sent an AUTH_CHALLENGE
-      cell. Fixes bug 9546; bugfix on 0.2.3.6-alpha.
-
-    - Bridges send AUTH_CHALLENGE cells during their handshakes; previously
-      they did not, which prevented relays from successfully connecting
-      to a bridge for self-test or bandwidth testing. Fixes bug 9546;
-      bugfix on 0.2.3.6-alpha.
-
diff --git a/changes/bug9564 b/changes/bug9564
deleted file mode 100644
index 0df00e3698..0000000000
--- a/changes/bug9564
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - If the time to download the next old-style networkstatus is in
-      the future, do not decline to consider whether to download the
-      next microdescriptor networkstatus. Fixes bug 9564. Bugfix on
-      0.2.3.14-alpha.
diff --git a/changes/doc-heartbeat-loglevel b/changes/doc-heartbeat-loglevel
deleted file mode 100644
index 91f40ad260..0000000000
--- a/changes/doc-heartbeat-loglevel
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor documentation fixes:
-    - Fix the documentation of HeartbeatPeriod to say that the heartbeat
-      message is logged at notice, not at info.
diff --git a/changes/geoip-august2013 b/changes/geoip-august2013
deleted file mode 100644
index bd15177a0c..0000000000
--- a/changes/geoip-august2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the August 7 2013 Maxmind GeoLite Country database.
-