commit 80b9a589bb351659252faa9793176ada6c9ce914 Merge: 2f269bfaf 1a181a476 Author: Nick Mathewson nickm@torproject.org Date: Thu May 3 16:48:03 2018 -0400

Merge remote-tracking branch 'dgoulet/ticket25914_034_01'

src/or/networkstatus.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)