commit a61020ebd45e81dec36bcfad460953e1920a11f9 Merge: 24ba186 c6fe65f Author: Nick Mathewson nickm@torproject.org Date: Thu May 4 08:58:28 2017 -0400

Merge branch 'prop140_complete_rebased'

changes/prop140 | 9 + src/or/consdiff.c | 9 + src/or/consdiff.h | 2 + src/or/consdiffmgr.c | 9 +- src/or/directory.c | 536 ++++++++++++++++++++++++++++------------- src/or/directory.h | 4 +- src/or/dirserv.c | 67 +++++- src/or/dirserv.h | 15 +- src/or/networkstatus.c | 72 ++++-- src/or/networkstatus.h | 1 + src/or/or.h | 5 + src/or/routerparse.c | 5 +- src/test/test_dir_handle_get.c | 4 + 13 files changed, 536 insertions(+), 202 deletions(-)