diff --git a/ChangeLog b/ChangeLog
index 7c88187298..3d666a654a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
Changes in version 0.2.3.18-rc - 2012-06-28
+ Tor 0.2.3.18-rc is the first release candidate for the Tor 0.2.3.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:
+ - Allow wildcarded mapaddress targets to be specified on the
+ controlport. Partially fixes bug 6244; bugfix on 0.2.3.9-alpha.
- 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;
@@ -11,8 +16,15 @@ Changes in version 0.2.3.18-rc - 2012-06-28
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
+ sending something to a directory we might not even be connected
to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.
+ - 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(). Bugfix on
+ 0.2.1.1-alpha; resolves ticket 6028.
+ - Downgrade "Got a certificate, but we already have it" log messages
+ from warning to info, except when we're a dirauth. Fixes bug 5238;
+ bugfix on 0.2.1.7-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.
@@ -20,30 +32,31 @@ Changes in version 0.2.3.18-rc - 2012-06-28
Fixes bug 5932; bugfix on 0.2.2.7-alpha.
o Minor bugfixes (on 0.2.3.x):
+ - Make format_helper_exit_status() avoid unnecessary space padding
+ and stop confusing log_from_pipe(). Fixes ticket 5557; bugfix
+ on 0.2.3.1-alpha.
- 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.
+ - Log a BUG message at severity INFO if we have a networkstatus with
+ a missing entry for some microdescriptor. Continues on a patch
+ to 0.2.3.2-alpha.
+ - Improve the log message 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.
+ - When formatting wildcarded address mappings for the controller,
+ be sure to include "*." as appropriate. Partially fixes bug 6244;
+ bugfix on 0.2.3.9-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.
+ - Stop logging messages about running with circuit timeout learning
+ enabled at severity 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
diff --git a/changes/bug5238 b/changes/bug5238
deleted file mode 100644
index 866f796377..0000000000
--- a/changes/bug5238
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes:
- - Downgrade "Got a certificate, but we already have it" log mesages from
- warning to info, except when we're a dirauth. Fixes bug #5238; bugfix
- on 0.2.1.7-alpha.
diff --git a/changes/bug6244 b/changes/bug6244
deleted file mode 100644
index c6d64ffdf5..0000000000
--- a/changes/bug6244
+++ /dev/null
@@ -1,4 +0,0 @@
- o Major bugfixes:
- - Allow wildcarded mapaddress targets to be specified on the controlport.
- Partial fix for bug 6244; bugfix on 0.2.3.9-alpha.
-
diff --git a/changes/bug6244_part2 b/changes/bug6244_part2
deleted file mode 100644
index ffeb5cd5b8..0000000000
--- a/changes/bug6244_part2
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes:
- - When formatting wildcarded address mappings for the controller,
- be sure to include "*." as appropriate. Partial fix for bug 6244;
- bugfix on 0.2.3.9-alpha.
diff --git a/src/common/util.c b/src/common/util.c
index 099cdd304c..4850e04d1a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -4031,7 +4031,7 @@ tor_get_exit_code(const process_handle_t *process_handle,
}
/** Helper: return the number of characters in s preceding the first
- * occurence of ch. If ch does not occur in s, return
+ * occurrence of ch. If ch does not occur in s, return
* the length of s. Should be equivalent to strspn(s, "ch"). */
static INLINE size_t
str_num_before(const char *s, char ch)
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 074b78d96f..6d1e4e7643 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -3503,7 +3503,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state)
if (state && options->UseEntryGuards &&
(purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) {
- /* This is request for an entry server to use for a regular circuit,
+ /* This request is for an entry server to use for a regular circuit,
* and we use entry guard nodes. Just return one of the guard nodes. */
return choose_random_entry(state);
}