Merge branch 'ticket12062_squashed'

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

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

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

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

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