commit e8db9d0c94f44115a6c64ad891f7e37c2f1828f0 Merge: d472952 841c4aa Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 4 11:41:50 2015 -0400 Merge branch 'feature3523_027' changes/feature3523 | 3 + src/or/control.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/control.h | 9 +++ src/or/directory.c | 6 ++ src/or/rendservice.c | 48 +++++++----- src/or/rendservice.h | 4 + 6 files changed, 246 insertions(+), 22 deletions(-)