Merge branch 'maint-0.3.1' into maint-0.3.2

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

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

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