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