commit 8387d8571ff85fb36097cdda78267aac509ec53e Merge: 86f1630 d20c6d2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 28 03:33:00 2012 -0400 Merge branch 'bug4011' changes/bug4011 | 8 ++++++ src/or/networkstatus.c | 57 +++++++++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 17 deletions(-)