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

[nickm at torproject.org]

commit ed806843dc8e7942a2a0abfbb2ae374e11963feb
Merge: 75fe218 3781f24
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:47:21 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

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