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

[nickm at torproject.org]

commit 102b2e7f8bd203fba84c0ce72a32dc0ed86d2f45
Merge: bf4559c 3781f24
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:50:53 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

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