Merge remote-tracking branch 'origin/maint-0.2.6'

diff --cc src/or/routerparse.c
Simple merge

diff --cc src/test/test_microdesc.c
Simple merge