Merge branch 'feature3523_027'

changes/feature3523

src/or/control.c

src/or/control.h

src/or/directory.c

src/or/rendservice.c

src/or/rendservice.h