commit 8b8e3476c05b24749f25fbce9e6c29a7125c841d
Author: Roger Dingledine <arma(a)torproject.org>
Date: Mon Jul 1 15:29:51 2013 -0400
fold in changes entries
---
ChangeLog | 16 ++++++++++++++++
changes/bug9122 | 4 ----
changes/bug9147 | 4 ----
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 875b325..344bd17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+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.
+ Please test it and let us know whether it is!
+
+ o Major bugfixes:
+ - When receiving a new configuration file via the control port's
+ LOADCONF command, do not treat the defaults file as absent.
+ Fixes bug 9122; bugfix on 0.2.3.9-alpha.
+
+ o Minor features:
+ - Issue a warning when running with the bufferevents backend enabled.
+ It's still not stable, and people should know that they're likely
+ to hit unexpected problems. Closes ticket 9147.
+
+
Changes in version 0.2.4.14-alpha - 2013-06-18
Tor 0.2.4.14-alpha fixes a pair of client guard enumeration problems
present in 0.2.4.13-alpha.
diff --git a/changes/bug9122 b/changes/bug9122
deleted file mode 100644
index 5009da6..0000000
--- a/changes/bug9122
+++ /dev/null
@@ -1,4 +0,0 @@
- o Major bugfixes:
- - When receiving a new configuration file via the control port's
- LOADCONF command, do not treat the defaults file as absent.
- Fixes bug 9122; bugfix on 0.2.3.9-alpha.
diff --git a/changes/bug9147 b/changes/bug9147
deleted file mode 100644
index e6064ea..0000000
--- a/changes/bug9147
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features:
- - Issue a warning when running with the bufferevents backend enabled.
- It's still not stable, and people should know that they're likely
- to hit unexpected problems. Closes ticket 9147.