[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug12951_r1'

[nickm at torproject.org]

commit 032e3b733f7bf304a778459597e7ed7b371234c7
Merge: f1782d9 374b531
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 13 13:22:10 2014 -0400

    Merge remote-tracking branch 'isis/bug12951_r1'

 src/or/networkstatus.c |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)