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

[nickm at torproject.org]

commit ff08b9b231d5b6625587865584843134bf1a4d67
Merge: fc5a881 a82b18f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 11 10:50:05 2013 -0500

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

 changes/bug10124 |    3 +++
 1 file changed, 3 insertions(+)