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

[nickm at torproject.org]

commit 252149e8b4697c570097acd514c433b8215f24dd
Merge: b585cf3 c6a3375
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 8 10:23:56 2015 -0500

    Merge branch 'maint-0.2.7'

 changes/bug17772    |    7 +++++++
 src/or/routerlist.c |   10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)