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

[nickm at torproject.org]

commit 62b239dd9c3c1945a72062223f5b131204ea987a
Merge: 3c8baa7 0ba0531
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 22 10:19:15 2016 -0400

    Merge branch 'maint-0.2.8'

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