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

[nickm at torproject.org]

commit 223c7da080713691531817bbf8b61589aa0a67ff
Merge: eb79dd4 43f187e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 22 20:47:23 2013 -0400

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

 changes/bug9564        |    5 +++++
 src/or/networkstatus.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)