Merge remote branch 'sebastian/bug1035' into maint-0.2.2

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

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

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

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