Merge branch 'bug8787_squashed'

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

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

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

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

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

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