[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 952f562691bb0888331afae3bec47541c0531467
Merge: a4995d1 6cf8e38
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 23 12:31:24 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 changes/bug6436        |    3 +++
 doc/asciidoc-helper.sh |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)