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

[nickm at torproject.org]

commit eeb743588af0ec09150bd7601d553bfbabba97ac
Merge: 4a2afd5 1ebdae6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:48:10 2017 -0500

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/trove-2017-001.2 |  8 ++++++++
 src/or/routerparse.c     | 49 +++++++++++++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 19 deletions(-)