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

[nickm at torproject.org]

commit ed600832d9fcd9ac6b2aacd36114f65ff227daf9
Merge: 2810753 aa051b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 15 11:18:58 2013 -0400

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

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