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

[nickm at torproject.org]

commit e32281b00095dbc764e995cf57290c9c1b0c9660
Merge: 693e48a f2d614c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 25 16:12:10 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 src/or/routerlist.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)