[tor-commits] [tor/release-0.2.3] fold in latest changes item

[arma at torproject.org]

commit d8d78f085adef4a3dd9d3c20983daa8571a44097
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jul 6 16:37:37 2012 -0400

    fold in latest changes item
    
    also realize that there's one too many columns (now that i'm in air
    conditioning and my brain has resumed working)
---
 ChangeLog                    |   24 ++++++++++++++----------
 changes/revert-geoip-may2012 |    6 ------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 49ac342..d39ebef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,19 @@
 Changes in version 0.2.3.19-rc - 2012-07-06
-   o Major bugfixes:
-     - Fix a bug handling SENDME cells on nonexistent streams that could
-       result in bizarre window values. Report and patch contributed
-       pseudonymously. Fixes part of bug 6271. This bug was introduced
-       before the first Tor release, in svn commit r152.
-     - Instead of ENOBUFS on Windows, say WSAENOBUFS. Fixes compilation
-       on Windows. Fixes bug 6296; bugfix on 0.2.3.18-rc.
-
-   o Minor bugfixes:
-     - Fix wrong TCP port range in parse_port_range(). Fixes bug 6218;
-       bugfix on 0.2.1.10-alpha.
+  o Major bugfixes:
+    - Fix a bug handling SENDME cells on nonexistent streams that could
+      result in bizarre window values. Report and patch contributed
+      pseudonymously. Fixes part of bug 6271. This bug was introduced
+      before the first Tor release, in svn commit r152.
+    - Revert to the May 1 2012 Maxmind GeoLite Country database. In the
+      June 2012 database, Maxmind marked many Tor relays as country "A1",
+      which will cause risky behavior for clients that set EntryNodes
+      or ExitNodes. Addresses bug 6334; bugfix on 0.2.3.17-beta.
+    - Instead of ENOBUFS on Windows, say WSAENOBUFS. Fixes compilation
+      on Windows. Fixes bug 6296; bugfix on 0.2.3.18-rc.
+
+  o Minor bugfixes:
+    - Fix wrong TCP port range in parse_port_range(). Fixes bug 6218;
+      bugfix on 0.2.1.10-alpha.
 
 
 Changes in version 0.2.3.18-rc - 2012-06-28
diff --git a/changes/revert-geoip-may2012 b/changes/revert-geoip-may2012
deleted file mode 100644
index e420947..0000000
--- a/changes/revert-geoip-may2012
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Revert to the May 1 2012 Maxmind GeoLite Country database. In the
-      June 2012 database, Maxmind marked many Tor relays as country "A1",
-      which will cause risky behavior for clients that set EntryNodes
-      or ExitNodes. Addresses bug 6334; bugfix on 0.2.3.17-beta.
-