Merge remote-tracking branch 'donncha/feature14846_4'

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

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

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

diff --cc src/test/test.c
Simple merge