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

commit 1889405aff5ae68a332c521d025ca106f95bfc08 Merge: 2eb5eca ed80684 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 15 07:50:55 2017 -0500 Merge branch 'maint-0.2.7' into release-0.2.7 changes/bug20384 | 10 ++++++++++ changes/trove-2017-001.2 | 8 ++++++++ src/or/routerparse.c | 49 +++++++++++++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 19 deletions(-)