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

[nickm at torproject.org]

commit ff649ec2d91e9471c9cd9d13132922fe270ab7d9
Merge: 35f449c cb6b3b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:58:10 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug21450     | 4 ++++
 src/or/routerparse.c | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)