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

[nickm at torproject.org]

commit 9c7edb0f3edd2dec30f10e195f7bcc12a4005f30
Merge: 33ffeab 50cbf22
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 20 10:46:50 2016 -0400

    Merge branch 'maint-0.2.8'

 src/or/routerlist.c | 2 ++
 1 file changed, 2 insertions(+)