fold in changes files so far

10 files changed, 38 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index de1861dcb6..72a3f2e1ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+Changes in version 0.2.3.17-alpha - 2012-06-??
+
+  o Major bugfixes:
+    - When building Tor on Windows with -DUNICODE (not default), ensure
+      that error messages, filenames, and DNS server names are always
+      NUL-terminated when we convert them to a single-byte encoding.
+      Fixes bug 5909; bugfix on 0.2.2.16-alpha.
+    - Change the default value for DynamicDHGroups (introduced in
+      0.2.3.9-alpha) to 0. This feature can make Tor relays less
+      identifiable by their use of the mod_ssl DH group, but at
+      the cost of some usability (#4721) and bridge tracing (#6087)
+      regressions. Resolves ticket 5598.
+    - Send a CRLF at the end of each STATUS_* control protocol event. This
+      bug tickled a bug in Vidalia which would make it freeze. Fixes
+      bug 6094; bugfix on 0.2.3.16-alpha.
+
+  o Minor bugfixes:
+    - Detect SSL handshake even when the initial attempt to write the
+      server hello fails. Fixes bug 4592; bugfix on 0.2.0.13-alpha.
+    - Make Tor build correctly again with -DUNICODE -D_UNICODE defined.
+      Fixes bug 6097; bugfix on 0.2.2.16-alpha.
+    - Fix an edge case where TestingTorNetwork is set but the authorities
+      and relays all have an uptime of zero, where the private Tor network
+      could briefly lack support for hidden services. Fixes bug 3886;
+      bugfix on 0.2.2.18-alpha.
+    - Correct the manpage's descriptions for the default values of 
+      DirReqStatistics and ExtraInfoStatistics. Fixes bug 2865; bugfix
+      on 0.2.3.1-alpha.
+
+  o Minor features:
+    - Rate-limit the "Weighted bandwidth is 0.000000" message, and add
+      more information to it, so that we can track it down in case it
+      returns again. Mitigates bug 5235.
+    - Check CircuitBuildTimeout and LearnCircuitBuildTimeout in
+      options_validate(); warn if LearnCircuitBuildTimeout is disabled and
+      CircuitBuildTimeout is set unreasonably low. Resolves ticket 5452.
+
+
 Changes in version 0.2.3.16-alpha - 2012-06-05
   Tor 0.2.3.16-alpha introduces a workaround for a critical renegotiation
   bug in OpenSSL 1.0.1 (where 20% of the Tor network can't talk to itself
diff --git a/changes/bug2865 b/changes/bug2865
deleted file mode 100644
index 4a7a332553..0000000000
--- a/changes/bug2865
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation fixes:
-    - Correct the manpage's descriptions for the default values of 
-      DirReqStatistics and ExtraInfoStatistics. Fixes bug 2865; bugfix
-      on 0.2.3.1-alpha.
diff --git a/changes/bug3886 b/changes/bug3886
deleted file mode 100644
index 691d4ef327..0000000000
--- a/changes/bug3886
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix an edge case where TestingTorNetwork is set but the authorities
-      and relays all have an uptime of zero, where the private Tor network
-      could briefly lack support for hidden services. Fixes bug 3886;
-      bugfix on 0.2.2.18-alpha.
diff --git a/changes/bug4592 b/changes/bug4592
deleted file mode 100644
index 31140b0ce8..0000000000
--- a/changes/bug4592
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Detect SSL handshake even when the initial attempt to write the
-      server hello fails. Fix for bug 4592; bugfix on 0.2.0.13-alpha.
diff --git a/changes/bug5235_log b/changes/bug5235_log
deleted file mode 100644
index 2448a001c1..0000000000
--- a/changes/bug5235_log
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Rate-limit the "Weighted bandwidth is 0.000000" message, and add
-      more information to it, so that we can track it down in case it
-      returns again. Mitigates bug 5235.
diff --git a/changes/bug5452 b/changes/bug5452
deleted file mode 100644
index 8e1d9adf7b..0000000000
--- a/changes/bug5452
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Check CircuitBuildTimeout and LearnCircuitBuildTimeout in
-      options_validate(); warn if LearnCircuitBuildTimeout is disabled
-      and CircuitBuildTimeout is set unreasonably low. Fixes bug 5452.
diff --git a/changes/bug5598 b/changes/bug5598
deleted file mode 100644
index e8e67415bd..0000000000
--- a/changes/bug5598
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Changed defaults:
-    - Change the default value for DynamicDHGroups to 0. This feature can
-      make Tor relays less identifiable by their use of the mod_ssl DH
-      group, but at the cost of some usability (#4721) and bridge tracing
-      (#6087) regressions. Resolves ticket #5598.
diff --git a/changes/bug5909 b/changes/bug5909
deleted file mode 100644
index 61990faefa..0000000000
--- a/changes/bug5909
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - When building Tor on Windows with -DUNICODE (not default),
-      ensure that error messages, filenames, and DNS server names are
-      always NUL-terminated when we convert them to a single-byte
-      encoding.  Fixes bug 5909; bugfix on 0.2.2.16-alpha.
diff --git a/changes/bug6094 b/changes/bug6094
deleted file mode 100644
index 835d127dad..0000000000
--- a/changes/bug6094
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Major bugfixes:
-
-    - Send a CRLF at the end of each STATUS_* control-port event.  A
-      change introduced in 0.2.3.16-alpha caused Tor to emit the CRLF
-      in the middle of a STATUS_* event; among other things, this
-      caused Vidalia to freeze.  Fixes bug 6094; bugfix on
-      0.2.3.16-alpha.
-
diff --git a/changes/fix_unicode b/changes/fix_unicode
deleted file mode 100644
index b97c393954..0000000000
--- a/changes/fix_unicode
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Make Tor build correctly again with -DUNICODE -D_UNICODE defined.
-      Bugfix on 0.2.2.16-alpha; fixes bug 6097.