commit e622f208a316cf3388003c1cdd1961eaaa8c370d Merge: 9c604e2bb 94ad47e33 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 09:27:03 2017 -0500

Merge remote-tracking branch 'teor/bug23827-v2'

changes/bug23827 | 8 ++++ src/or/networkstatus.c | 26 +++++++++++++ src/or/networkstatus.h | 1 + src/or/policies.c | 31 +++++++++++---- src/test/test_dir.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 7 deletions(-)