[tor-commits] [tor/master] Merge remote-tracking branch 'houqp/hs_control'

[nickm at torproject.org]

commit fee7f25ff845dc9a99dac59e67fdb9517750176c
Merge: 27d81c7 ebd9931
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 3 12:28:42 2014 -0500

    Merge remote-tracking branch 'houqp/hs_control'

 changes/ticket8510      |    4 ++
 src/or/control.c        |   92 ++++++++++++++++++++++++++++++++++++-
 src/or/control.h        |   14 +++++-
 src/or/directory.c      |   19 ++++++--
 src/or/rendclient.c     |    4 ++
 src/or/router.c         |   23 ++++++++++
 src/or/router.h         |    1 +
 src/test/Makefile.nmake |    3 +-
 src/test/include.am     |    2 +
 src/test/test.c         |    4 ++
 src/test/test_hs.c      |  115 +++++++++++++++++++++++++++++++++++++++++++++++
 src/test/test_router.c  |   38 ++++++++++++++++
 12 files changed, 312 insertions(+), 7 deletions(-)