commit d05d21c89a21695ba9de32140ff13c68610b39f0 Merge: 6346d73 acfa374 Author: Nick Mathewson nickm@torproject.org Date: Thu May 14 10:46:45 2015 -0400

Merge branch 'bug15880_027_03'

changes/bug15881 | 3 ++ src/or/control.c | 87 +++++++++++++++++++++++++++++++++++++++++---------- src/or/control.h | 7 ++--- src/or/directory.c | 5 ++- src/or/or.h | 4 +++ src/or/rendclient.c | 7 +++++ src/or/rendcommon.c | 9 +++++- src/or/rendcommon.h | 6 ++++ src/test/test_hs.c | 58 +++++++++++++++++++++++----------- 9 files changed, 144 insertions(+), 42 deletions(-)