Merge remote-tracking branch 'public/bug1031'

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

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

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

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

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

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

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

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

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