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

[nickm at torproject.org]

commit a452b713955422e217f7056cf50cb3591830dee9
Merge: 124062e 194e310
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:47:04 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

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