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

[nickm at torproject.org]

commit e085b11d27f3396e0fd49156d74245594fd4eb88
Merge: 6e181ba 0ba0531
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 22 10:19:52 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug19947    | 4 ++++
 src/or/routerlist.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)