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

[nickm at torproject.org]

commit 8efa933da9fba5b1f821e0f8c7c0ae0f3723c0fe
Merge: 4f62b68 9bb3bcb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 9 08:31:03 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug20715    |  4 ++++
 src/or/routerlist.c | 13 +++++++++++++
 2 files changed, 17 insertions(+)