commit b0b0d6af6369f53caed2222837149dc4a90c739c Merge: f219976 699c39d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 19 14:54:05 2013 -0500 Merge branch 'bug2286_unit_test_squashed' changes/bug2286 | 5 + src/or/dirserv.c | 21 +- src/or/dirserv.h | 3 +- src/or/dirvote.c | 57 +++- src/or/dirvote.h | 10 +- src/or/networkstatus.c | 13 +- src/or/networkstatus.h | 2 + src/or/or.h | 10 +- src/or/routerparse.c | 17 +- src/or/routerparse.h | 1 + src/test/test_dir.c | 982 +++++++++++++++++++++++++++++++++++++++--------- 11 files changed, 923 insertions(+), 198 deletions(-)