[tor-commits] [tor/release-0.2.7] Merge branch 'maint-0.2.4' into maint-0.2.5

[arma at torproject.org]

commit c3d11b119dbd46fa02a1e26d76ddc74424dd4b18
Merge: 4328525 35deb4d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 8 10:20:14 2015 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

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