commit d6a2fec05ebcc39773a2f6666e1378410c64f047 Merge: ff5eb7f 548d142 Author: Nick Mathewson nickm@torproject.org Date: Tue May 17 11:09:54 2016 -0400

Merge branch 'bug18616-v4-merged_028' into maint-0.2.8

changes/bug18616 | 14 +++++ src/or/circuitbuild.c | 2 +- src/or/circuituse.c | 5 +- src/or/config.c | 9 ++-- src/or/control.c | 15 +++--- src/or/dirserv.c | 7 ++- src/or/main.c | 4 +- src/or/rephist.c | 9 ++-- src/or/router.c | 140 ++++++++++++++++++++++++++++++++++--------------- src/or/router.h | 4 +- src/test/test_dir.c | 46 ++++++++++++++++ src/test/test_policy.c | 3 +- 12 files changed, 193 insertions(+), 65 deletions(-)