Merge branch 'maint-0.3.1'

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

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

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

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

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

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

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

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