Merge remote-tracking branch 'arma/ticket18332-try3'

changes/ticket18332

src/or/directory.c

src/or/rendcache.c

src/or/rendcache.h

src/or/rendcommon.c

src/or/rendcommon.h

src/test/test_dir_handle_get.c

src/test/test_rendcache.c