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

[nickm at torproject.org]

commit c0ff59f870a9a831b927f853e3e5e7066a727b05
Merge: c0257f1 a452b71
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:50:48 2017 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

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