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

[nickm at torproject.org]

commit d39f7138063125b92f738715ca1bcd53f5ef147c
Merge: f2e7271 a1178cd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 18:13:45 2013 -0400

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

 changes/bug8587 |    5 +++++
 configure.ac    |   44 ++++++++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 18 deletions(-)