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

[nickm at torproject.org]

commit c19a3d1bf893b19d73b3a9038162c403817034ac
Merge: 83513a9 6eeedc0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 6 10:18:07 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug19191    | 5 +++++
 src/or/routerlist.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)