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

[nickm at torproject.org]

commit 1ebdae61711ec03ce49af2f356756b5db9587412
Merge: 9b90d51 ed80684
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:47:28 2017 -0500

    Merge branch 'maint-0.2.7' into maint-0.2.8

 changes/bug20384         | 10 ++++++++++
 changes/trove-2017-001.2 |  8 ++++++++
 src/or/routerparse.c     | 49 +++++++++++++++++++++++++++++-------------------
 3 files changed, 48 insertions(+), 19 deletions(-)