commit 9ebe202da0c56ed6c006a0410a636a9e99d111f7 Merge: 19a9872 9b5a19c Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 20 19:30:24 2016 -0400 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 changes/bug20103 | 7 +++++++ src/or/networkstatus.c | 24 +++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-)