summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-06-28 13:42:30 -0400
committerRoger Dingledine <arma@torproject.org>2012-06-28 13:42:30 -0400
commit36d8a2535e01bce2c1c5242e76a4a2e134f06040 (patch)
tree86caceb5fb772758c572612e45e7042678f3af5c
parentaad40483b3b7e9a26a0324b7c86b496fb2f4de87 (diff)
downloadtor-36d8a2535e01bce2c1c5242e76a4a2e134f06040.tar.gz
tor-36d8a2535e01bce2c1c5242e76a4a2e134f06040.zip
fold in more changes entries
-rw-r--r--ChangeLog10
-rw-r--r--changes/bug52384
-rw-r--r--changes/bug62444
-rw-r--r--changes/bug6244_part24
4 files changed, 9 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c88187298..8eb082c476 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
Changes in version 0.2.3.18-rc - 2012-06-28
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 +13,11 @@ 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.
+ - 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.
@@ -26,6 +31,9 @@ Changes in version 0.2.3.18-rc - 2012-06-28
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
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.