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

[nickm at torproject.org]

commit 1b5320bfe3d178c20357b9860087147a6cbb099b
Merge: da30adc 06efbbb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 18 11:28:11 2013 -0400

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

 changes/bug8719        |    6 ++++++
 src/or/networkstatus.c |    5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)