Merge branch 'prop140_complete_rebased'

changes/prop140

src/or/consdiff.c

src/or/consdiff.h

src/or/consdiffmgr.c

src/or/directory.c

src/or/directory.h

src/or/dirserv.c

src/or/dirserv.h

src/or/networkstatus.c

src/or/networkstatus.h

src/or/or.h

src/or/routerparse.c

src/test/test_dir_handle_get.c