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

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

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

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