commit 3781f24b8014213c200f74973deb550382957a01 Merge: 43c18b1 a452b71 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 15 07:47:12 2017 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

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