fold in new changes entries

diff --git a/ChangeLog b/ChangeLog
index c77177be1e0e7bdfd7c6f89bf1acdfe3655d1c60..4bf945297779b58d73e0f5858ec1eeca37347941 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
-Changes in version 0.2.2.30-rc - 2011-07-06
+Changes in version 0.2.2.30-rc - 2011-07-07
   o Minor bugfixes:
+    - Send a SUCCEEDED stream event to the controller when a reverse
+      resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue
+      discovered by katmagic.
     - Always NUL-terminate the sun_path field of a sockaddr_un before
       passing it to the kernel. (Not a security issue: kernels are
       smart enough to reject bad sockaddr_uns.) Found by Coverity;
@@ -15,6 +18,9 @@ Changes in version 0.2.2.30-rc - 2011-07-06
       service we didn't ask for. Found by Coverity; CID #30. Bugfix
       on 0.2.2.26-beta.
 
+  o Minor features:
+    - Update to the July 1 2011 Maxmind GeoLite Country database.
+
 
 Changes in version 0.2.2.29-beta - 2011-06-20
   Tor 0.2.2.29-beta reverts an accidental behavior change for users who

diff --git a/changes/bug3536 b/changes/bug3536
deleted file mode 100644 (file)
index d3cec13..0000000
--- a/changes/bug3536
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Send a SUCCEEDED stream event to the controller when a reverse
-      resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue
-      discovered by katmagic.
-

diff --git a/changes/geoip-july2011 b/changes/geoip-july2011
deleted file mode 100644 (file)
index 7a9f119..0000000
--- a/changes/geoip-july2011
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the July 1 2011 Maxmind GeoLite Country database.
-