[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug7059'

[nickm at torproject.org]

commit 02a43e5eb65a81e28765c2183c2b3087cf5882fe
Merge: b17aa28 0e8be13
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 13 21:50:07 2012 -0500

    Merge remote-tracking branch 'public/bug7059'

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