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

[nickm at torproject.org]

commit f2d614c3d93aceac4954f7cd593213a5fcfbb123
Merge: 6d375f1 9cf6af7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 25 16:12:01 2016 -0400

    Merge branch 'bug19175_028_v2' into maint-0.2.8

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