commit c6c87fb6d172abc7838694e4175f09f60c2ebf87 Merge: 3502b10 3193cbe Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 3 11:05:29 2014 -0500 Merge remote-tracking branch 'public/bug10758' changes/bug10758 | 4 + src/or/config.c | 42 +--- src/or/control.c | 34 +-- src/or/directory.c | 212 ++---------------- src/or/dirserv.c | 397 +--------------------------------- src/or/dirserv.h | 8 - src/or/main.c | 5 - src/or/networkstatus.c | 557 +----------------------------------------------- src/or/networkstatus.h | 15 -- src/or/nodelist.c | 4 +- src/or/or.h | 78 +------ src/or/router.c | 12 +- src/or/router.h | 1 - src/or/routerlist.c | 243 +-------------------- src/or/routerlist.h | 3 +- src/or/routerparse.c | 220 ------------------- src/or/routerparse.h | 2 - src/test/test_dir.c | 99 +-------- 18 files changed, 59 insertions(+), 1877 deletions(-)