fold in new changes entries

12 files changed, 52 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index a89a01ad6e..923e5d0db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+Changes in version 0.2.3.15-alpha - 2012-04-30
+  Tor 0.2.3.15-alpha fixes a variety of smaller bugs, including making
+  the development branch build on Windows again.
+
+  o Minor bugfixes (on 0.2.2.x and earlier):
+    - Make sure that there are no unhandled pending TLS errors before
+      reading from a TLS stream. We had checks in 0.1.0.3-rc, but
+      lost them in 0.1.0.5-rc when we refactored read_to_buf_tls().
+      Bugfix on 0.1.0.5-rc; fixes bug 4528.
+    - Fix an assert that directory authorities could trigger on sighup
+      during some configuration state transitions. We now don't treat
+      it as a fatal error when the new descriptor we just generated in
+      init_keys() isn't accepted. Fixes bug 4438; bugfix on 0.2.1.9-alpha.
+    - After we pick a directory mirror, we would refuse to use it if
+      it's in our ExcludeExitNodes list, resulting in mysterious failures
+      to bootstrap for people who just wanted to avoid exiting from
+      certain locations. Fixes bug 5623; bugfix on 0.2.2.25-alpha.
+    - When building with --enable-static-tor on OpenBSD, do not
+      erroneously attempt to link -lrt. Fixes bug 5103.
+
+  o Minor bugfixes (on 0.2.3.x):
+    - When Tor is built with kernel headers from a recent (last few
+      years) Linux kernel, do not fail to run on older (pre-2.6.28
+      Linux kernels). Fixes bug 5112; bugfix on 0.2.3.1-alpha.
+    - Fix cross-compilation isssues with mingw. Bugfixes on 0.2.3.6-alpha
+      and 0.2.3.12-alpha.
+    - Fix compilation with miniupnpc version 1.6; patch from
+      Anthony G. Basile. Fixes bug 5434; bugfix on 0.2.3.12-alpha.
+    - Fix compilation with MSVC, which had defined MS_WINDOWS. Bugfix
+      on 0.2.3.13-alpha; found and fixed by Gisle Vanem.
+    - Fix compilation on platforms without unistd.h, or where environ
+      is defined in stdlib.h. Fixes bug 5704; bugfix on 0.2.3.13-alpha.
+
+  o Minor features:
+    - Directory authorities are now a little more lenient at accepting
+      older router descriptors, or newer router descriptors that don't
+      make big changes. This should help ameliorate past and future
+      issues where routers think they have uploaded valid descriptors,
+      but the authorities don't think so. Fix for ticket 2479.
+    - Make the code that clients use to detect an address change be
+      IPv6-aware, so that it won't fill clients' logs with error
+      messages when trying to get the IPv4 address of an IPv6
+      connection. Implements ticket 5537.
+
+  o Removed features:
+    - Remove the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays option;
+      authorities needed to use it for a while to keep the network working
+      as people upgraded to 0.2.1.31, 0.2.2.34, or 0.2.3.6-alpha, but
+      that was six months ago. As of now, it should no longer be needed
+      or used.
+
+
 Changes in version 0.2.3.14-alpha - 2012-04-23
   Tor 0.2.3.14-alpha fixes yet more bugs to get us closer to a release
   candidate. It also dramatically speeds up AES: fast relays should
diff --git a/changes/bug2749 b/changes/bug2749
deleted file mode 100644
index 964a828859..0000000000
--- a/changes/bug2749
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Changed parameters (authorities):
-    - Authorities are now a little more lenient at accepting older
-      router descriptors, or newer router descriptors that don't make
-      big changes. This should help ameliorate past and future issues
-      where routers think they have uploaded valid descriptors, but the
-      authorities don't think so. Fix for ticket 2479.
-
-
diff --git a/changes/bug4438 b/changes/bug4438
deleted file mode 100644
index 94690e18e0..0000000000
--- a/changes/bug4438
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Fix a dirauth-only exit on sighup that could happen during some
-      configuration state transitions. We now don't treat it as a fatal
-      error when the new descriptor we just generated in init_keys
-      isn't accepted. Fixes bug 4438; bugfix on 0.2.1.9-alpha.
-
diff --git a/changes/bug4528 b/changes/bug4528
deleted file mode 100644
index 8703d6a010..0000000000
--- a/changes/bug4528
+++ /dev/null
@@ -1,6 +0,0 @@
-
-   o Minor bugfixes:
-     - Make sure that there are no unhandled pending TLS errors before
-       reading from a TLS stream. We had checks in 0.1.0.3-rc, but
-       lost them in 0.1.0.5-rc when we refactored read_to_buf_tls().
-       Bugfix on 0.1.0.5-rc; fixes bug 4528.
diff --git a/changes/bug4572 b/changes/bug4572
deleted file mode 100644
index 3107bf9135..0000000000
--- a/changes/bug4572
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Removed features
-    - Remove the GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays option;
-      authorities needed to use it for a while to keep the network working
-      as people upgraded to 0.2.1.31, 0.2.2.34, or 0.2.3.6-alpha, but that
-      was six months ago.  As of now, it should no longer be needed or used.
-
diff --git a/changes/bug5103 b/changes/bug5103
deleted file mode 100644
index dbc462ca79..0000000000
--- a/changes/bug5103
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (build):
-    - When building with --enable-static-tor on OpenBSD, do not
-      erroneously attempt to link -lrt.
diff --git a/changes/bug5112 b/changes/bug5112
deleted file mode 100644
index 9607a928b9..0000000000
--- a/changes/bug5112
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - When Tor is built with kernel headers from a recent (last few
-      years) Linux kernel, do not fail to run on older (pre-2.6.28
-      Linux kernels). Fixes bug 5112; bugfix on 0.2.3.1-alpha.
-      
diff --git a/changes/bug5434 b/changes/bug5434
deleted file mode 100644
index 31c02d700d..0000000000
--- a/changes/bug5434
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Fix compilation with miniupnpc version 1.6; patch from
-      Anthony G. Basile. Fixes bug 5434.
diff --git a/changes/bug5537 b/changes/bug5537
deleted file mode 100644
index bcad2a29bd..0000000000
--- a/changes/bug5537
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features:
-    - Make the code that clients use to detect an address change be
-      IPv6-aware, so that it won't fill clients' logs with error
-      messages when trying to get the IPv4 address of an IPv6
-      connection. Implements ticket 5537.
diff --git a/changes/bug5623 b/changes/bug5623
deleted file mode 100644
index 285a5b1d79..0000000000
--- a/changes/bug5623
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - After we pick a directory mirror, we would refuse to use it if
-      it's in our ExcludeExitNodes list, resulting in mysterious failures
-      to bootstrap for people who just wanted to avoid exiting from
-      certain locations. Fixes bug 5623; bugfix on 0.2.2.25-alpha.
-
diff --git a/changes/bug5704 b/changes/bug5704
deleted file mode 100644
index 40afefb256..0000000000
--- a/changes/bug5704
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix compilation on platforms without unistd.h, or where environ
-      is defined in stdlib.h. Fixes bug 5704; bugfix on
-      0.2.3.13-alpha.
\ No newline at end of file
diff --git a/changes/mingw-fixes b/changes/mingw-fixes
deleted file mode 100644
index f8cac1859e..0000000000
--- a/changes/mingw-fixes
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix cross-compilation isssues with mingw. Bugfixes on
-      0.2.3.6-alpha and 0.2.3.12-alpha.
-    - Fix compilation with MSVC, which had defined MS_WINDOWS.  Bugfix
-      on 0.2.3.13-alpha; found and fixed by Gisle Vanem.
\ No newline at end of file