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

[nickm at torproject.org]

commit 2afdf8de2f8a71e6a7de24546a03e505f4258aff
Merge: 92f8b56 194e310
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:50:45 2017 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

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