Merge branch 'maint-0.2.8' into maint-0.2.9

diff --cc src/common/crypto.c
Simple merge

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

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