[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8719' into maint-0.2.4

[nickm at torproject.org]

commit 06efbbb47ef28dd24cb4482f5b82204918891f41
Merge: 9fec0c1 cd2b508
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 18 11:26:54 2013 -0400

    Merge remote-tracking branch 'public/bug8719' into maint-0.2.4

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