Merge remote-tracking branch 'public/bug10841'

changes/bug10841

src/or/directory.c

src/or/or.h

src/or/rendclient.c

src/or/rendcommon.c

src/or/rendcommon.h