Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

diff --cc src/common/compat.h
Simple merge

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

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

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

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

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

diff --cc src/or/or.h
Simple merge