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

[nickm at torproject.org]

commit 28cbcd033cadc9dfcabf4e179fc3649d8ec595e2
Merge: 44ea3dc f2d614c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 25 16:40:51 2016 -0400

    Merge branch 'maint-0.2.8'

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