fold in 0.2.3.26 changes entries so far. surprisingly few!

10 files changed, 21 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 62099c5f2b..ca40d056f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+Changes in version 0.2.3.26 - 2013-0?-??
+
+  o Major bugfixes:
+    - Reject bogus create and relay cells with 0 circuit ID or 0 stream
+      ID: these could be used to create unexpected streams and circuits
+      which would count as "present" to some parts of Tor but "absent"
+      to others, leading to zombie circuits and streams or to a bandwidth
+      denial-of-service. Fixes bug 7889; bugfix on every released version
+      of Tor. Reported by "oftc_must_be_destroyed".
+
+  o Minor bugfixes:
+    - Avoid a crash if we fail to generate an extrainfo descriptor.
+      Fixes bug 8208; bugfix on 0.2.3.16-alpha. Found by Coverity;
+      this is CID 718634.
+    - Correctly recognize that [::1] is a loopback address. Fixes
+      bug 8377; bugfix on 0.2.1.3-alpha.
+
+  o Minor features:
+    - Update to the April 3 2013 Maxmind GeoLite Country database.
+
+
 Changes in version 0.2.3.25 - 2012-11-19
   The Tor 0.2.3 release series is dedicated to the memory of Len "rabbi"
   Sassaman (1980-2011), a long-time cypherpunk, anonymity researcher,
diff --git a/changes/bug7889 b/changes/bug7889
deleted file mode 100644
index ce99a59ce5..0000000000
--- a/changes/bug7889
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes:
-    - Reject bogus create and relay cells with 0 circuit ID or 0 stream
-      ID: these could be used to create unexpected streams and circuits
-      which would count as "present" to some parts of Tor but "absent"
-      to others, leading to zombie circuits and streams or to a
-      bandwidth DOS. Fixes bug 7889; bugfix on every released version of
-      Tor. Reported by "oftc_must_be_destroyed".
-
diff --git a/changes/bug8208 b/changes/bug8208
deleted file mode 100644
index c85db90b52..0000000000
--- a/changes/bug8208
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Avoid a crash if we fail to generate an extrinfo descriptor.
-      Fixes bug 8208; bugfix on 0.2.3.16-alpha. Found by Coverity;
-      this is CID 718634.
diff --git a/changes/bug8377 b/changes/bug8377
deleted file mode 100644
index c9ad151bc9..0000000000
--- a/changes/bug8377
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Correctly recognize that [::1] is a loopback address. Fixes bug #8377;
-      bugfix on 0.2.1.3-alpha.
diff --git a/changes/geoip-apr2013 b/changes/geoip-apr2013
deleted file mode 100644
index 74d9c63b79..0000000000
--- a/changes/geoip-apr2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the April 3 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-dec2012 b/changes/geoip-dec2012
deleted file mode 100644
index 26431c2e8a..0000000000
--- a/changes/geoip-dec2012
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the December 5 2012 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-feb2013 b/changes/geoip-feb2013
deleted file mode 100644
index b5d794258f..0000000000
--- a/changes/geoip-feb2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the February 6 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-jan2013 b/changes/geoip-jan2013
deleted file mode 100644
index 45e5a150cc..0000000000
--- a/changes/geoip-jan2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the January 2 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-mar2013 b/changes/geoip-mar2013
deleted file mode 100644
index e9cc3981b3..0000000000
--- a/changes/geoip-mar2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the March 6 2013 Maxmind GeoLite Country database.
-
diff --git a/changes/geoip-nov2012 b/changes/geoip-nov2012
deleted file mode 100644
index 22e7bace58..0000000000
--- a/changes/geoip-nov2012
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the November 7 2012 Maxmind GeoLite Country database.
-