Start a changelog for 0.2.2.31-??. No editing has yet been done on the entries.

8 files changed, 36 insertions, 43 deletions

diff --git a/ChangeLog b/ChangeLog
index 686fcb97a4..4055ab6ab6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+Changes in version 0.2.2.31-?? - 2011-08-??
+  o Major bugfixes:
+    - Remove an extra pair of quotation marks around the error
+      message in control-port STATUS_GENERAL BUG events.  Bugfix on
+      0.1.2.6-alpha; fixes bug 3732.
+    - Write control ports to disk only after switching UID and
+      creating the data directory. This way, we don't fail when
+      starting up with a nonexistant DataDirectory and a
+      ControlPortWriteToFile setting based on that directory. Fixes
+      bug 3747; bugfix on Tor 0.2.2.26-beta.
+
+  o Minor features:
+    - Update to the August 2 2011 Maxmind GeoLite Country database.
+
+  o Minor bugfixes:
+    - Allow GETINFO fingerprint to return a fingerprint even when
+      we have not yet built a router descriptor. Fixes bug 3577;
+      bugfix on 0.2.0.1-alpha.
+    - Write several files in text mode, on OSes that distinguish text
+      mode from binary mode (namely, Windows).  These files are:
+      buffer-stats, dirreq-stats, and entry-stats on relays that collect
+      those statistics; client_keys and hostname files for hidden
+      services that use authentication; and (in the tor-gencert utility)
+      newly generated identity and signing keys.  Previously, we
+      wouldn't specify text mode or binary mode, leading to an assertion
+      failure.  Fixes bug 3607.  Bugfix on 0.2.1.1-alpha (when the
+      DirRecordUsageByCountry option which would have triggered the
+      assertion failure was added), although this assertion failure
+      would have occurred in tor-gencert on Windows in 0.2.0.1-alpha.
+    - Selectively disable deprecation warnings on OS X because Lion started
+      deprecating the shipped copy of openssl. Fixes bug 3643.
+    - When unable to format an address as a string, report its value
+      as "???" rather than reusing the last formatted address. Bugfix
+      on 0.2.1.5-alpha.
+
+
 Changes in version 0.2.2.30-rc - 2011-07-07
   Tor 0.2.2.30-rc is the first release candidate for the Tor 0.2.2.x
   series. It fixes a few smaller bugs, but generally appears stable.
diff --git a/changes/bug3577 b/changes/bug3577
deleted file mode 100644
index 6335272752..0000000000
--- a/changes/bug3577
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Allow GETINFO fingerprint to return a fingerprint even when
-      we have not yet built a router descriptor. Fixes bug 3577;
-      bugfix on 0.2.0.1-alpha.
diff --git a/changes/bug3607 b/changes/bug3607
deleted file mode 100644
index 5ece21934b..0000000000
--- a/changes/bug3607
+++ /dev/null
@@ -1,15 +0,0 @@
-  o Minor bugfixes:
-
-    - Write several files in text mode, on OSes that distinguish text
-      mode from binary mode (namely, Windows).  These files are:
-      buffer-stats, dirreq-stats, and entry-stats on relays that collect
-      those statistics; client_keys and hostname files for hidden
-      services that use authentication; and (in the tor-gencert utility)
-      newly generated identity and signing keys.  Previously, we
-      wouldn't specify text mode or binary mode, leading to an assertion
-      failure.  Fixes bug 3607.  Bugfix on 0.2.1.1-alpha (when the
-      DirRecordUsageByCountry option which would have triggered the
-      assertion failure was added), although this assertion failure
-      would have occurred in tor-gencert on Windows in 0.2.0.1-alpha.
-
-
diff --git a/changes/bug3643 b/changes/bug3643
deleted file mode 100644
index 86bd920cac..0000000000
--- a/changes/bug3643
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Selectively disable deprecation warnings on OS X because Lion started
-      deprecating the shipped copy of openssl. Fixes bug 3643.
-
diff --git a/changes/bug3732 b/changes/bug3732
deleted file mode 100644
index 7a71d1aef3..0000000000
--- a/changes/bug3732
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes:
-
-    - Remove an extra pair of quotation marks around the error
-      message in control-port STATUS_GENERAL BUG events.  Bugfix on
-      0.1.2.6-alpha; fixes bug 3732.
-
-
diff --git a/changes/bug3747 b/changes/bug3747
deleted file mode 100644
index 052dab1bd0..0000000000
--- a/changes/bug3747
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Write control ports to disk only after switching UID and
-      creating the data directory. This way, we don't fail when
-      starting up with a nonexistant DataDirectory and a
-      ControlPortWriteToFile setting based on that directory. Fixes
-      bug 3747; bugfix on Tor 0.2.2.26-beta.
\ No newline at end of file
diff --git a/changes/fmt_addr b/changes/fmt_addr
deleted file mode 100644
index b88c9e1bf4..0000000000
--- a/changes/fmt_addr
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When unable to format an address as a string, report its value
-      as "???" rather than reusing the last formatted address. Bugfix
-      on 0.2.1.5-alpha.
diff --git a/changes/geoip-august2011 b/changes/geoip-august2011
deleted file mode 100644
index 6de8b0f29c..0000000000
--- a/changes/geoip-august2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the August 2 2011 Maxmind GeoLite Country database.
-