summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-07-19 00:15:54 -0400
committerRoger Dingledine <arma@torproject.org>2013-07-19 00:15:54 -0400
commit2b9fb51ac61c75d582008e892773fc1571145d65 (patch)
tree1efed45fcc92043226ab8a68dabf4eb9f05c445a
parentbc6c7ea74ec1b62c7a6ca817e9c5695bafc57af3 (diff)
downloadtor-2b9fb51ac61c75d582008e892773fc1571145d65.tar.gz
tor-2b9fb51ac61c75d582008e892773fc1571145d65.zip
fold in recent changes stanzas
-rw-r--r--ChangeLog16
-rw-r--r--changes/bug92005
-rw-r--r--changes/bug92544
-rw-r--r--changes/bug92954
-rw-r--r--changes/geoip-july20133
5 files changed, 16 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 344bd179aa..e28e2ff3f3 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 7b64dd1744..0000000000
--- 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 5179bdc523..0000000000
--- 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 2c113616c3..0000000000
--- 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 097819dd7c..0000000000
--- a/changes/geoip-july2013
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor features:
- - Update to the July 3 2013 Maxmind GeoLite Country database.
-