commit 2251667ff239d508be6b01a59a47d0c235da2465 Merge: 15b1357 5b5e20a Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 5 17:00:43 2017 -0400 Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1 changes/task-22207 | 4 ++++ src/or/networkstatus.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)