commit c2150628fd819f8a6679e9717c659d9468c27a8a Author: Roger Dingledine arma@torproject.org Date: Sat Aug 10 18:04:17 2013 -0400

fold in change stanza --- ChangeLog | 5 +++++ changes/v3_intro_len | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog index e741732..34aa04a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ Changes in version 0.2.4.16-rc - 2013-08-0? - Fix a bug in the voting algorithm that could yield incorrect results when a non-naming authority declared too many flags. Fixes bug 9200; bugfix on 0.2.0.3-alpha. + - Fix an uninitialized read that could in some cases lead to a remote + crash while parsing INTRODUCE 1 cells. Bugfix on 0.2.4.1-alpha. + Anybody running a hidden service on the experimental 0.2.4.x + branch should upgrade. (This is, so far as we know, unrelated to + the recent news.) - Avoid an assertion failure when processing DNS replies without the answer types we expected. Fixes bug 9337; bugfix on 0.2.4.7-alpha. - Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on diff --git a/changes/v3_intro_len b/changes/v3_intro_len deleted file mode 100644 index fbe39bc..0000000 --- a/changes/v3_intro_len +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes: - - - Fix an uninitialized read that could (in some cases) lead to a remote - crash while parsing INTRODUCE 1 cells. (This is, so far as we know, - unrelated to the recent news.) Fixes bug XXX; bugfix on - 0.2.4.1-alpha. Anybody running a hidden service on the experimental - 0.2.4.x branch should upgrade. -