commit 54000d7ad9fc92136981da7c270e0646a5288bf3 Merge: 9a81ed1 6f5f38a Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 23 12:24:35 2015 -0400

Merge remote-tracking branch 'dgoulet/bug14847_027_06'

src/or/control.c | 210 ++++++++++++++++++++++++++++++++--- src/or/control.h | 24 ++-- src/or/directory.c | 38 ++++++- src/or/or.h | 4 + src/or/rendclient.c | 296 ++++++++++++++++++++++++++++++++++---------------- src/or/rendclient.h | 2 + src/or/rendcommon.c | 38 ++++++- src/or/rendcommon.h | 4 +- src/or/routerparse.c | 3 +- src/test/test_hs.c | 84 +++++++++++++- 10 files changed, 570 insertions(+), 133 deletions(-)