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

[nickm at torproject.org]

commit 8c69207793ecbe8404396493ae60ea3a21fb968b
Merge: ee250be 74a534b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 12 21:28:09 2013 -0400

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

 doc/HACKING |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)