[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

commit fce2a15ffbea9a2a54b0686c2859a1ee1039a660 Merge: 3f33696 03e3cf6 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 25 10:41:15 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/bug16400 | 5 +++++ src/or/routerparse.c | 14 +++++++++++--- src/test/test_microdesc.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-)