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

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

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

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

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

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