commit a767b6664059c1688f3d8e58c1cded367791e97f Merge: d3f714d e65fe0a Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 18 13:29:12 2015 -0500 Merge branch 'bug13762_diagnostic_redux' src/or/routerlist.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-)