[tor-commits] [tor/release-0.2.4] fold in recent changes stanzas

[arma at torproject.org]

commit 2b9fb51ac61c75d582008e892773fc1571145d65
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jul 19 00:15:54 2013 -0400

    fold in recent changes stanzas
---
 ChangeLog              |   16 ++++++++++++++++
 changes/bug9200        |    5 -----
 changes/bug9254        |    4 ----
 changes/bug9295        |    4 ----
 changes/geoip-july2013 |    3 ---
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 344bd17..e28e2ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Changes in version 0.2.4.16-rc - 2013-07-2?
+  o Major bugfixes:
+    - Fix a bug in the voting algorithm that could yield incorrect results
+      when a non-naming authority declared too many flags. Fixes bug 9200;
+      bugfix on 0.2.0.3-alpha.
+    - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on
+      0.2.4.15-rc. Found by stem integration tests.
+
+  o Minor bugfixes:
+    - Fix a spurious compilation warning with some older versions of
+      GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha.
+
+  o Minor features:
+    - Update to the July 3 2013 Maxmind GeoLite Country database.
+
+
 Changes in version 0.2.4.15-rc - 2013-07-01
   Tor 0.2.4.15-rc is the first release candidate for the Tor 0.2.4.x
   series. It fixes a few smaller bugs, but generally appears stable.
diff --git a/changes/bug9200 b/changes/bug9200
deleted file mode 100644
index 7b64dd1..0000000
--- a/changes/bug9200
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Fix a bug in the voting algorithm that could yield incorrect results
-      when a non-naming authority declared too many flags. Fixes bug 9200;
-      bugfix on 0.2.0.3-alpha.
-
diff --git a/changes/bug9254 b/changes/bug9254
deleted file mode 100644
index 5179bdc..0000000
--- a/changes/bug9254
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix a spurious compilation warning with some older versions of
-      GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha.
-
diff --git a/changes/bug9295 b/changes/bug9295
deleted file mode 100644
index 2c11361..0000000
--- a/changes/bug9295
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Major bugfixes:
-    - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on
-      0.2.4.15-rc. Found by stem integration tests.
-
diff --git a/changes/geoip-july2013 b/changes/geoip-july2013
deleted file mode 100644
index 097819d..0000000
--- a/changes/geoip-july2013
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update to the July 3 2013 Maxmind GeoLite Country database.
-