[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'public/bug9564' into maint-0.2.3

[nickm at torproject.org]

commit 8bf2892f51eb15dcba2a174968efa3cb12d5b6b6
Merge: 64410cc 2530c84
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 22 20:46:40 2013 -0400

    Merge remote-tracking branch 'public/bug9564' into maint-0.2.3

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