Merge remote-tracking branch 'public/bug2385'

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

diff --cc src/common/util.h
Simple merge

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

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