commit 1e97b6afc62388a6835d92c6fc9543cfa8caf964 Merge: ef03dc0 9f217c8 Author: Nick Mathewson nickm@torproject.org Date: Thu May 19 08:17:11 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug17150 | 7 + 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/dirserv.c | 9 +- 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/or/or.h | 12 +- src/or/router.c | 12 +- src/or/routerlist.c | 37 +++-- src/or/routerlist.h | 2 +- src/or/routerparse.c | 4 +- src/test/test_connection.c | 405 ++++++++++++++++++++++++++++----------------- src/test/test_dir.c | 153 +++++++++++++++-- src/test/test_routerlist.c | 48 ++++++ 21 files changed, 639 insertions(+), 625 deletions(-)