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

[nickm at torproject.org]

commit e9e6a1f54781bab186e8c107c2e496d7786ab096
Merge: 022d322 8d96223
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 13:20:57 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18816    |  2 --
 src/or/routerlist.c | 16 ++++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)