commit bf372578c1d09f7241c12bccc1f7fe4d6c599bc7 Author: Roger Dingledine arma@torproject.org Date: Mon Jul 28 03:08:35 2014 -0400

fold in a few more --- ChangeLog | 11 +++++++++++ changes/bug1038-3 | 6 ------ changes/bug12718 | 5 ----- 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog index b3787b8..6f673ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,17 @@ Changes in version 0.2.5.6-alpha - 2014-07-2? Country database. - Slightly enhance the diagnostic message for bug 12184.

+ o Minor bugfixes (also in 0.2.4.23): + - Warn and drop the circuit if we receive an inbound 'relay early' + cell. Those used to be normal to receive on hidden service circuits + due to bug 1038, but the buggy Tor versions are long gone from + the network so we can afford to resume watching for them. Resolves + the rest of bug 1038; bugfix on 0.2.1.19. + - Correct a confusing error message when trying to extend a circuit + via the control protocol but we don't know a descriptor or + microdescriptor for one of the specified relays. Fixes bug 12718; + bugfix on 0.2.3.1-alpha. + o Minor bugfixes: - Fix compilation when building with bufferevents enabled. (This configuration is still not expected to work, however.) diff --git a/changes/bug1038-3 b/changes/bug1038-3 deleted file mode 100644 index 5af4afa..0000000 --- a/changes/bug1038-3 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Warn and drop the circuit if we receive an inbound 'relay early' - cell. Those used to be normal to receive on hidden service circuits - due to bug 1038, but the buggy Tor versions are long gone from - the network so we can afford to resume watching for them. Resolves - the rest of bug 1038; bugfix on 0.2.1.19. diff --git a/changes/bug12718 b/changes/bug12718 deleted file mode 100644 index 0c5f708..0000000 --- a/changes/bug12718 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Correct a confusing error message when trying to extend a circuit - via the control protocol but we don't know a descriptor or - microdescriptor for one of the specified relays. Fixes bug 12718; - bugfix on 0.2.3.1-alpha.