commit b4126dcd22577c02f46497718783fd792ff32588 Author: Roger Dingledine arma@torproject.org Date: Thu Jun 7 03:55:12 2012 -0400

apply 6abb638954b to 0.2.3.16-alpha too --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index ceb26da..de1861d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -131,7 +131,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 - Fix a NULL-pointer dereference on a badly formed SETCIRCUITPURPOSE command. Found by mikeyc. Fixes bug 5796; bugfix on 0.2.2.9-alpha. - - Fix a build warning with Clang 3.1 related to our use of vasprint. + - Fix a build warning with Clang 3.1 related to our use of vasprintf. Fixes bug 5969. Bugfix on 0.2.2.11-alpha. - Defensively refactor rend_mid_rendezvous() so that protocol violations and length checks happen in the beginning. Fixes