[tor-commits] [tor/master] Merge branch 'bug17150_027_extra' into maint-0.2.8

[nickm at torproject.org]

commit 3f49474349538be499ab485c697c147c8829fa0d
Merge: d6a2fec 00f74e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 17 19:47:22 2016 -0400

    Merge branch 'bug17150_027_extra' into 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(-)