commit d718c717a67051cb1da2a1f80c70401d0d10b374 Merge: 159ea7a 9f217c8 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 19 08:25:12 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809 | 14 ++ src/or/circuituse.c | 19 +++ src/or/connection.c | 45 ----- src/or/connection.h | 7 - src/or/directory.c | 262 ++++------------------------- src/or/directory.h | 4 - src/or/main.c | 11 -- src/or/microdesc.c | 4 +- src/or/microdesc.h | 2 +- src/or/networkstatus.c | 189 ++++++++------------- src/or/networkstatus.h | 9 +- src/test/test_connection.c | 405 ++++++++++++++++++++++++++++----------------- src/test/test_dir.c | 153 +++++++++++++++-- src/test/test_routerlist.c | 48 ++++++ 14 files changed, 578 insertions(+), 594 deletions(-)