commit f1682a615f9af50f4380bf1bb44070f299422a0a Merge: 040b478 57da1a5 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 7 12:22:56 2014 -0500

Merge remote-tracking branch 'houqp/hs_control_fix'

src/or/control.c | 55 ++++++++++++++++++++++------------- src/or/control.h | 1 + src/or/directory.c | 6 ++-- src/or/nodelist.c | 21 +++++++++++++- src/or/nodelist.h | 2 ++ src/or/rendclient.c | 2 +- src/or/router.c | 23 --------------- src/or/router.h | 1 - src/test/include.am | 2 +- src/test/test.c | 4 +-- src/test/test_hs.c | 54 +++++++++++++++++++++++++---------- src/test/test_nodelist.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ src/test/test_router.c | 37 ------------------------ 13 files changed, 175 insertions(+), 104 deletions(-)