commit a7f6e434be6aa402153af0c6dd3238c58e35ed27 Merge: 3690967 3f49474 Author: Nick Mathewson <nickm@torproject.org> Date: Tue May 17 19:48:49 2016 -0400 Merge branch 'maint-0.2.8' changes/bug17150 | 7 +++++++ src/or/dirserv.c | 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 +++- 7 files changed, 56 insertions(+), 27 deletions(-)