commit 51329054199e2b7eb3aed46282028f04e13a13ad Merge: 297635f 5280a70 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 24 10:45:11 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19973 | 6 ++++++ src/or/circuitbuild.c | 9 +++++++-- src/or/or.h | 5 ++++- src/or/routerlist.c | 14 ++++++++------ src/or/routerlist.h | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-)