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

[nickm at torproject.org]

commit 383fdeca124d416eb4256feab4e0b8d02380c248
Merge: d309d28 1ebdae6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:50:58 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

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