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

[nickm at torproject.org]

commit fd34049f3d565e906d4c1e9b73332f61ebfe7673
Merge: f282488 50cbf22
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 20 10:46:45 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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