commit aab626405c312a33d521c9ca3729552fd9ccca2e Merge: b3e591dca de343b4e4 Author: Nick Mathewson nickm@torproject.org Date: Fri May 11 18:15:43 2018 -0400

Merge remote-tracking branch 'catalyst-github/bug25756'

changes/bug25756 | 7 ++ src/or/connection.c | 8 +- src/or/connection.h | 7 +- src/or/networkstatus.c | 71 +++++++++++++----- src/or/networkstatus.h | 2 + src/test/log_test_helpers.h | 4 + src/test/test_routerlist.c | 175 ++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 242 insertions(+), 32 deletions(-)