commit 9f217c83b0d91508af0d63f04216fa78cdbfbe1b Merge: 3f49474 f698b50 Author: Nick Mathewson nickm@torproject.org Date: Thu May 19 08:17:02 2016 -0400

Merge branch 'bug18809_028_squashed' into 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 | 264 ++++------------------------- src/or/directory.h | 4 - src/or/main.c | 13 +- src/or/microdesc.c | 4 +- src/or/microdesc.h | 2 +- src/or/networkstatus.c | 194 ++++++++-------------- 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, 583 insertions(+), 598 deletions(-)