merge changes files into upcoming changelog

20 files changed, 59 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index e2e9f45e94..7c88187298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,62 @@
+Changes in version 0.2.3.18-rc - 2012-06-28
+
+  o Major bugfixes:
+    - Make our linker option detection code more robust against linkers
+      such as on FreeBSD 8, where a bad combination of options completes
+      successfully but makes an unrunnable binary. Fixes bug 6173;
+      bugfix on 0.2.3.17-beta.
+
+  o Minor bugfixes (on 0.2.2.x and earlier):
+    - Avoid a false positive in the util/threads unit test by increasing
+      the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha.
+    - Replace "Sending publish request" log messages with "Launching
+      upload", so that they no longer confusingly imply that we're
+      sending somtheing to a directory we might not even be connected
+      to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.
+    - When checking for requested signatures on the latest consensus
+      before serving it to a client, make sure to check the right
+      consensus flavor. Bugfix on 0.2.2.6-alpha.
+    - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN.
+      Fixes bug 5932; bugfix on 0.2.2.7-alpha.
+
+  o Minor bugfixes (on 0.2.3.x):
+    - Downgrade a message about cleaning the microdescriptor cache to
+      "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha.
+    - Improve log message issued when a managed proxy fails to
+      launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.
+    - Don't do DNS lookups when parsing corrupted managed proxy protocol
+      messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha.
+    - Avoid a warning caused by using strcspn() from glibc with clang 3.0.
+      Bugfix on 0.2.3.13-alpha.
+    - Make format_helper_exit_status() avoid unnecessary space padding and
+      stop confusing log_from_pipe(). Fixes ticket 5557.
+    - Make sure to set *socket_error in all error cases in
+      connection_connect(), so it can't produce a warning about errno
+      being zero from errno_to_orconn_end_reason(). Resolves ticket 6028.
+    - Remove non-bug log messages about running with circuit timeout
+      learning enabled from LD_BUG. Fixes bug 6169; bugfix on
+      0.2.3.17-beta.
+    - Disable a spurious warning about reading on a marked and flushing
+      connection. We shouldn't be doing that, but apparently we
+      sometimes do. Fixes bug 6203; bugfix on 0.2.3.17-beta.
+    - Fix a bug that stopped AllowDotExit from working on addresses
+      that had an entry in the DNS cache. Fixes bug 6211; bugfix on
+      0.2.3.17-beta.
+    - Log a BUG message at INFO if we have a networkstatus with a missing
+      entry for some microdescriptor.
+
+  o Code simplification, refactoring, unit tests:
+    - Move tor_gettimeofday_cached() into compat_libevent.c, and use
+      Libevent's notion of cached time when possible.
+    - Remove duplicate code for invoking getrlimit() from control.c.
+    - Add a unit test for the environment_variable_names_equal function.
+
+  o Documentation:
+    - Document the --defaults-torrc option, and the new (in 0.2.3)
+      semantics for overriding, extending, and clearing lists of
+      options. Closes bug 4748.
+
+
 Changes in version 0.2.3.17-beta - 2012-06-15
   Tor 0.2.3.17-beta enables compiler and linker hardening by default,
   gets our TLS handshake back on track for being able to blend in with
diff --git a/changes/bug3311 b/changes/bug3311
deleted file mode 100644
index 014d18ddc9..0000000000
--- a/changes/bug3311
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Replace "Sending publish request" log messages with "Launching
-      upload", so that they no longer confusingly imply that we're
-      sending somtheing to a directory we might not even be connected
-      to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.
diff --git a/changes/bug4748 b/changes/bug4748
deleted file mode 100644
index 9c0f9cff0c..0000000000
--- a/changes/bug4748
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation:
-    - Document the --defaults-torrc option, and the new (in 0.2.3)
-      semantics for overriding, extending, and clearing lists of
-      options. Closes bug 4748.
diff --git a/changes/bug5099 b/changes/bug5099
deleted file mode 100644
index 4c46a396a2..0000000000
--- a/changes/bug5099
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Improve log message issued when a managed proxy fails to
-      launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.
diff --git a/changes/bug5557 b/changes/bug5557
deleted file mode 100644
index c73fbe2839..0000000000
--- a/changes/bug5557
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes
-    - Make format_helper_exit_status() avoid unnecessary space padding and
-      stop confusing log_from_pipe().  Fixes ticket 5557.
diff --git a/changes/bug5932 b/changes/bug5932
deleted file mode 100644
index f2ca98edfb..0000000000
--- a/changes/bug5932
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Downgrade "eventdns rejected address" message to LOG_PROTOCOL_WARN.
-      Fixes bug 5932; bugfix on 0.2.2.7-alpha.
diff --git a/changes/bug6028 b/changes/bug6028
deleted file mode 100644
index fedd02f742..0000000000
--- a/changes/bug6028
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes:
-   - Make sure to set *socket_error in all error cases in
-     connection_connect(), so it can't produce a warning about errno being
-     zero from errno_to_orconn_end_reason().  Resolves ticket 6028.
diff --git a/changes/bug6169 b/changes/bug6169
deleted file mode 100644
index 9880fc94d8..0000000000
--- a/changes/bug6169
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Remove a non-bug log messages about running with circuit timeout
-      learning enabled from LD_BUG. Fixes bug 6169; bugfix on
-      0.2.3.17-beta.
diff --git a/changes/bug6173 b/changes/bug6173
deleted file mode 100644
index 3b467a9aca..0000000000
--- a/changes/bug6173
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Make our linker option detection code more robust against linkers
-      where a bad combination of options completes successfully but
-      makes an unrunnable binary. Fixes bug 6173; bugfix on 0.2.3.17-beta.
-
diff --git a/changes/bug6203 b/changes/bug6203
deleted file mode 100644
index bf967535b8..0000000000
--- a/changes/bug6203
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Disable a spurious warning about reading on a marked and flushing
-      connection. We shouldn't be doing that, but apparently we
-      sometimes do. Fix for bug 6203; bugfix on 0.2.3.17-beta.
-
diff --git a/changes/bug6211 b/changes/bug6211
deleted file mode 100644
index 2c8d9b8e70..0000000000
--- a/changes/bug6211
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix a bug that stopped AllowDotExit from working on addresses
-      that had an entry in the DNS cache. Fixes bug 6211; bugfix on
-      0.2.3.17-beta.
diff --git a/changes/bug6226 b/changes/bug6226
deleted file mode 100644
index 7cbee10fe7..0000000000
--- a/changes/bug6226
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Don't do DNS lookups when parsing corrupted managed proxy
-      protocol messages. Fixes bug 6226; bugfix on 0.2.3.6-alpha.
diff --git a/changes/bug6227 b/changes/bug6227
deleted file mode 100644
index 77b06ac511..0000000000
--- a/changes/bug6227
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (unit tests):
-    - Avoid a false positive in the util/threads unit test by increasing
-      the maximum timeout time. Fixes bug 6227; bugfix on 0.2.0.4-alpha.
diff --git a/changes/bug6238 b/changes/bug6238
deleted file mode 100644
index 67cfd1db67..0000000000
--- a/changes/bug6238
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Downgrade a message about cleaning the microdescriptor cache to
-      "info" from "notice". Fixes bug 6238; bugfix on 0.2.3.1-alpha.
diff --git a/changes/check_correct_flav_sigs b/changes/check_correct_flav_sigs
deleted file mode 100644
index db21182dd3..0000000000
--- a/changes/check_correct_flav_sigs
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - When checking for requested signatures on the latest consensus before
-      serving it to a client, make sure to check the right consensus flavor.
-      Bugfix on 0.2.2.6-alpha.
diff --git a/changes/clang_strcspn b/changes/clang_strcspn
deleted file mode 100644
index 38670ac376..0000000000
--- a/changes/clang_strcspn
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Avoid a warning caused by using strcspn from glibc with clang 3.0.
-      Bugfix on 0.2.3.13-alpha.
diff --git a/changes/descriptor_limit b/changes/descriptor_limit
deleted file mode 100644
index 29be3d981c..0000000000
--- a/changes/descriptor_limit
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Code simplification and refactoring:
-    - Remove duplicate code for invoking getrlimit() from control.c.
diff --git a/changes/envvar_test b/changes/envvar_test
deleted file mode 100644
index d76a817078..0000000000
--- a/changes/envvar_test
+++ /dev/null
@@ -1,2 +0,0 @@
-  o New unit tests:
-    - Add a unit test for the environment_variable_names_equal function.
\ No newline at end of file
diff --git a/changes/log_bad_md_entry b/changes/log_bad_md_entry
deleted file mode 100644
index 3c653277c2..0000000000
--- a/changes/log_bad_md_entry
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (debugging):
-    - Log a BUG message at INFO if we have a networkstatus with a missing
-      entry for some microdescriptor.
diff --git a/changes/move_cached_gtod b/changes/move_cached_gtod
deleted file mode 100644
index 53d80920f9..0000000000
--- a/changes/move_cached_gtod
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Move tor_gettimeofday_cached() into compat_libevent.c, and use
-      Libevent's notion of cached time when possible.