summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-06-10 15:02:30 -0400
committerRoger Dingledine <arma@torproject.org>2013-06-10 15:02:30 -0400
commite86f12226540ea058defc892cc55cfed744c33d8 (patch)
treee07a6699426c954d28d3d29c1519515fac1dfd59
parentb4b14921da4a81b5ed2cdafd5b7ff230b298edd4 (diff)
downloadtor-e86f12226540ea058defc892cc55cfed744c33d8.tar.gz
tor-e86f12226540ea058defc892cc55cfed744c33d8.zip
fold in one more
-rw-r--r--ChangeLog12
-rw-r--r--changes/bug90176
2 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 621f4265a5..9bf0c3faa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,10 +9,6 @@ Changes in version 0.2.4.13-alpha - 2013-06-1?
the list of freelists if it somehow gets an unrecognized
allocation. Fixes bug 8844; bugfix on 0.2.0.16-alpha. Reported by
eugenis.
- - Follow the socks5 protocol when offering username/password
- authentication. The fix for bug 8117 exposed this bug, and it
- turns out real-world applications like Pidgin do care. Bugfix on
- 0.2.3.2-alpha; fixes bug 8879.
- We used to always request authority certificates by identity digest,
meaning we'd get the newest one even when we wanted one with a
different signing key. Then we would complain about being given
@@ -20,6 +16,14 @@ Changes in version 0.2.4.13-alpha - 2013-06-1?
wanted. Now we use the "fp-sk/" resource as well as the "fp/"
resource to request the one we want. Fixes bug 5595; bugfix on
0.2.0.8-alpha.
+ - Avoid an assertion failure on OpenBSD (and perhaps other BSDs)
+ when an exit connection with optimistic data succeeds immediately
+ rather than returning EINPROGRESS. Fixes bug 9017; bugfix on
+ 0.2.3.1-alpha.
+ - Follow the socks5 protocol when offering username/password
+ authentication. The fix for bug 8117 exposed this bug, and it
+ turns out real-world applications like Pidgin do care. Bugfix on
+ 0.2.3.2-alpha; fixes bug 8879.
- Fix a directory authority crash bug when building a consensus
using an older consensus as its basis. Fixes bug 8833. Bugfix
on 0.2.4.12-alpha.
diff --git a/changes/bug9017 b/changes/bug9017
deleted file mode 100644
index 359c526b00..0000000000
--- a/changes/bug9017
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major bugfixes:
- - Avoid an assertion failure on OpenBSD (and perhaps other BSDs)
- when an exit connection with optimistic data succeeds immediately
- rather than returning EINPROGRESS. Fixes bug 9017; bugfix on
- 0.2.3.1-alpha.
-